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,
Daniel Mack <daniel@caiaq.de>
Subject: Re: linux-next: build failure after merge of the sound tree
Date: Tue, 01 Jun 2010 07:47:20 +0200 [thread overview]
Message-ID: <s5hd3wb8ftj.wl%tiwai@suse.de> (raw)
In-Reply-To: <20100601123011.3f20ffde.sfr@canb.auug.org.au>
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@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@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
next prev parent reply other threads:[~2010-06-01 5:47 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-01 2:30 linux-next: build failure after merge of the sound tree Stephen Rothwell
2010-06-01 5:47 ` Takashi Iwai [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-18 3:12 Stephen Rothwell
2023-08-18 11:47 ` Takashi Iwai
2023-05-24 3:54 Stephen Rothwell
2023-05-24 7:14 ` Takashi Iwai
2022-07-15 12:44 Stephen Rothwell
2022-07-15 14:41 ` Takashi Iwai
2022-07-15 19:09 ` Andy Shevchenko
2021-10-18 0:38 Stephen Rothwell
2021-10-18 6:35 ` Takashi Iwai
2020-07-17 3:01 Stephen Rothwell
2020-07-17 5:33 ` Christoph Hellwig
2020-07-17 6:34 ` Takashi Iwai
2020-07-17 6:50 ` Christoph Hellwig
2020-07-17 6:54 ` Takashi Iwai
2019-08-09 2:54 Stephen Rothwell
2019-08-09 5:55 ` Takashi Iwai
2017-05-17 1:29 Stephen Rothwell
2017-05-17 5:30 ` Takashi Iwai
2011-09-23 2:49 Stephen Rothwell
2011-09-23 5:21 ` Takashi Iwai
2011-05-19 1:15 Stephen Rothwell
2010-09-23 2:44 Stephen Rothwell
2010-09-23 6:04 ` Takashi Iwai
2010-09-23 8:39 ` Mark Brown
2010-06-24 3:03 Stephen Rothwell
2010-06-24 6:11 ` Takashi Iwai
2010-06-28 16:33 ` Daniel Mack
2010-04-07 3:39 Stephen Rothwell
2010-04-07 6:06 ` Takashi Iwai
2010-04-07 7:16 ` Stephen Rothwell
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=s5hd3wb8ftj.wl%tiwai@suse.de \
--to=tiwai@suse.de \
--cc=daniel@caiaq.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).