From: Takashi Iwai <tiwai@suse•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Joe Perches <joe@perches•com>
Subject: Re: linux-next: build failure after merge of the final tree (sound tree related)
Date: Tue, 14 Jun 2011 08:19:05 +0200 [thread overview]
Message-ID: <s5haadldjfq.wl%tiwai@suse.de> (raw)
In-Reply-To: <20110614160309.553d1767.sfr@canb.auug.org.au>
At Tue, 14 Jun 2011 16:03:09 +1000,
Stephen Rothwell wrote:
>
> Hi all,
>
> After merging the final tree, today's linux-next build (i386 defconfig)
> failed like this:
>
> sound/pci/hda/snd-hda-codec-realtek.o: In function `snd_hda_detach_beep_device':
> (.text+0xb6d0): multiple definition of `snd_hda_detach_beep_device'
> sound/pci/hda/snd-hda-codec.o:(.text+0xba0): first defined here
> sound/pci/hda/snd-hda-codec-analog.o: In function `snd_hda_detach_beep_device':
> (.text+0x33e0): multiple definition of `snd_hda_detach_beep_device'
> sound/pci/hda/snd-hda-codec.o:(.text+0xba0): first defined here
> sound/pci/hda/snd-hda-codec-idt.o: In function `snd_hda_detach_beep_device':
> (.text+0x6560): multiple definition of `snd_hda_detach_beep_device'
> sound/pci/hda/snd-hda-codec.o:(.text+0xba0): first defined here
> sound/pci/hda/snd-hda-codec-conexant.o: In function `snd_hda_detach_beep_device':
> (.text+0x40d0): multiple definition of `snd_hda_detach_beep_device'
> sound/pci/hda/snd-hda-codec.o:(.text+0xba0): first defined here
>
> Caused by commit 2308f4add3de ("ALSA: hda - Fix beep_device compilation
> warnings").
>
> I have reverted that commit for today.
Oops, it was a simple missing static-inline in the patch.
Fixed now with the following commit.
Sorry for inconvenience.
Takashi
---
From: Takashi Iwai <tiwai@suse•de>
Subject: [PATCH] ALSA: hda - Fix missing static inline to beep dummy function
The commit 2308f4add3de9f6c9c9f02e49461e94d84bb200a missed static inline
thus it resulted in multiple-definitions error at linking.
Signed-off-by: Takashi Iwai <tiwai@suse•de>
---
sound/pci/hda/hda_beep.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
index 4967eab..55f0647 100644
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
@@ -54,7 +54,7 @@ static inline int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
{
return 0;
}
-void snd_hda_detach_beep_device(struct hda_codec *codec)
+static inline void snd_hda_detach_beep_device(struct hda_codec *codec)
{
}
#endif
--
1.7.5.3
next prev parent reply other threads:[~2011-06-14 6:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-14 6:03 linux-next: build failure after merge of the final tree (sound tree related) Stephen Rothwell
2011-06-14 6:19 ` Takashi Iwai [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-10-28 14:42 Stephen Rothwell
2013-10-28 15:14 ` Takashi Iwai
2012-10-18 3:16 Stephen Rothwell
2012-10-18 6:18 ` Takashi Iwai
2012-08-24 7:20 Stephen Rothwell
2012-08-25 13:42 ` Takashi Iwai
2012-03-14 7:05 Stephen Rothwell
2012-03-14 7:22 ` Takashi Iwai
2011-11-01 9:24 Stephen Rothwell
2011-11-01 9:48 ` Takashi Iwai
2011-06-28 6:50 Stephen Rothwell
2011-06-28 6:57 ` Takashi Iwai
2011-03-16 6:39 Stephen Rothwell
2011-03-16 6:49 ` Takashi Iwai
2011-01-11 2:20 Stephen Rothwell
2011-01-11 6:40 ` Takashi Iwai
2010-09-21 6:40 Stephen Rothwell
2010-09-21 8:02 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5haadldjfq.wl%tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox