linux-next: build failure after merge of the sound tree
in [Kernel]
|
Prev: [PATCH] Documentation/timers/hpet_example.c: only build on X64
Next: Describe events in a structured way via sysfs
From: Stephen Rothwell on 31 May 2010 22:40 Hi Takashi, After merging the sound tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/usb/gadget/audio.c:37: drivers/usb/gadget/f_audio.c:104: error: 'UAC_MUTE_CONTROL' undeclared here (not in a function) drivers/usb/gadget/f_audio.c:113: error: 'UAC_VOLUME_CONTROL' undeclared here (not in a function) Presumably caused by commit 65f25da44b51f55e3a74301c25f29263be2bf1ba ("ALSA: usb-audio: unify constants from specification"). I have used the version of the sound tree from next-20100531 for today. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Takashi Iwai on 1 Jun 2010 01:50
At Tue, 1 Jun 2010 12:30:11 +1000, Stephen Rothwell wrote: > > [1 <text/plain; US-ASCII (quoted-printable)>] > Hi Takashi, > > After merging the sound tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > In file included from drivers/usb/gadget/audio.c:37: > drivers/usb/gadget/f_audio.c:104: error: 'UAC_MUTE_CONTROL' undeclared here (not in a function) > drivers/usb/gadget/f_audio.c:113: error: 'UAC_VOLUME_CONTROL' undeclared here (not in a function) > > Presumably caused by commit 65f25da44b51f55e3a74301c25f29263be2bf1ba > ("ALSA: usb-audio: unify constants from specification"). > > I have used the version of the sound tree from next-20100531 for today. Oops, I forgot to run the build test of the whole tree... Fixed it now like below. thanks, Takashi --- From f07ff97b012ff9485618faeadcc9b1e5f72ceefa Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Tue, 1 Jun 2010 07:42:03 +0200 Subject: [PATCH] usb/gadget: Replace the old USB audio FU definitions in f_audio.c The USB audio FU definitions were renewed by the commit 65f25da44b51f55e3a74301c25f29263be2bf1ba ALSA: usb-audio: unify constants from specification Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- drivers/usb/gadget/f_audio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c index 43bf445..b91115f 100644 --- a/drivers/usb/gadget/f_audio.c +++ b/drivers/usb/gadget/f_audio.c @@ -101,7 +101,7 @@ static struct uac_feature_unit_descriptor_0 feature_unit_desc = { static struct usb_audio_control mute_control = { .list = LIST_HEAD_INIT(mute_control.list), .name = "Mute Control", - .type = UAC_MUTE_CONTROL, + .type = UAC_FU_MUTE, /* Todo: add real Mute control code */ .set = generic_set_cmd, .get = generic_get_cmd, @@ -110,7 +110,7 @@ static struct usb_audio_control mute_control = { static struct usb_audio_control volume_control = { .list = LIST_HEAD_INIT(volume_control.list), .name = "Volume Control", - .type = UAC_VOLUME_CONTROL, + .type = UAC_FU_VOLUME, /* Todo: add real Volume control code */ .set = generic_set_cmd, .get = generic_get_cmd, -- 1.7.0.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |