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

[Stephen Rothwell]

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.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature