Re: linux-next: build failure after merge of the final tree (sound tree related)

[Takashi Iwai]

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@xxxxxxx>
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@xxxxxxx>
---
 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


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/