From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753342Ab1FNGTJ (ORCPT ); Tue, 14 Jun 2011 02:19:09 -0400 Received: from cantor.suse.de ([195.135.220.2]:60186 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751210Ab1FNGTH (ORCPT ); Tue, 14 Jun 2011 02:19:07 -0400 Date: Tue, 14 Jun 2011 08:19:05 +0200 Message-ID: From: Takashi Iwai To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Joe Perches Subject: Re: linux-next: build failure after merge of the final tree (sound tree related) In-Reply-To: <20110614160309.553d1767.sfr@canb.auug.org.au> References: <20110614160309.553d1767.sfr@canb.auug.org.au> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 --- 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