diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:04 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:04 +0200 |
commit | 74bf40f0793fed9e01eb6164c2ce63e8c27ca205 (patch) | |
tree | f41312c0943978842ac258873b29da04d72d0625 /drivers/usb/gadget/gmidi.c | |
parent | Merge branch 'topic/asoc' into for-linus (diff) | |
parent | ALSA: als4000: Fix potentially invalid DMA mode setup (diff) | |
download | linux-74bf40f0793fed9e01eb6164c2ce63e8c27ca205.tar.xz linux-74bf40f0793fed9e01eb6164c2ce63e8c27ca205.zip |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'drivers/usb/gadget/gmidi.c')
-rw-r--r-- | drivers/usb/gadget/gmidi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c index 2b56ce621852..b7bf88019b06 100644 --- a/drivers/usb/gadget/gmidi.c +++ b/drivers/usb/gadget/gmidi.c @@ -238,7 +238,7 @@ static const struct usb_interface_descriptor ac_interface_desc = { }; /* B.3.2 Class-Specific AC Interface Descriptor */ -static const struct uac_ac_header_descriptor_v1_1 ac_header_desc = { +static const struct uac1_ac_header_descriptor_1 ac_header_desc = { .bLength = UAC_DT_AC_HEADER_SIZE(1), .bDescriptorType = USB_DT_CS_INTERFACE, .bDescriptorSubtype = USB_MS_HEADER, |