aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-01 06:38:49 -0500
committerTakashi Iwai <tiwai@suse.de>2010-03-01 06:38:49 -0500
commit12c2a682b55a40f2a986e36d6632110029bc63a5 (patch)
treeba21f049e4859411f6c135d597dc26260963ce7c /drivers
parenta86ba28583987b85845ed61be5f12aafb5fc4971 (diff)
parentaefbd3e823d4fe219bb6420b0cac505847270507 (diff)
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/f_audio.c6
-rw-r--r--drivers/usb/gadget/gmidi.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c
index df77f6131c73..f1e3aad76c37 100644
--- a/drivers/usb/gadget/f_audio.c
+++ b/drivers/usb/gadget/f_audio.c
@@ -60,7 +60,7 @@ DECLARE_UAC_AC_HEADER_DESCRIPTOR(2);
60#define UAC_DT_TOTAL_LENGTH (UAC_DT_AC_HEADER_LENGTH + UAC_DT_INPUT_TERMINAL_SIZE \ 60#define UAC_DT_TOTAL_LENGTH (UAC_DT_AC_HEADER_LENGTH + UAC_DT_INPUT_TERMINAL_SIZE \
61 + UAC_DT_OUTPUT_TERMINAL_SIZE + UAC_DT_FEATURE_UNIT_SIZE(0)) 61 + UAC_DT_OUTPUT_TERMINAL_SIZE + UAC_DT_FEATURE_UNIT_SIZE(0))
62/* B.3.2 Class-Specific AC Interface Descriptor */ 62/* B.3.2 Class-Specific AC Interface Descriptor */
63static struct uac_ac_header_descriptor_2 ac_header_desc = { 63static struct uac_ac_header_descriptor_v1_2 ac_header_desc = {
64 .bLength = UAC_DT_AC_HEADER_LENGTH, 64 .bLength = UAC_DT_AC_HEADER_LENGTH,
65 .bDescriptorType = USB_DT_CS_INTERFACE, 65 .bDescriptorType = USB_DT_CS_INTERFACE,
66 .bDescriptorSubtype = UAC_HEADER, 66 .bDescriptorSubtype = UAC_HEADER,
@@ -124,7 +124,7 @@ static struct usb_audio_control_selector feature_unit = {
124}; 124};
125 125
126#define OUTPUT_TERMINAL_ID 3 126#define OUTPUT_TERMINAL_ID 3
127static struct uac_output_terminal_descriptor output_terminal_desc = { 127static struct uac_output_terminal_descriptor_v1 output_terminal_desc = {
128 .bLength = UAC_DT_OUTPUT_TERMINAL_SIZE, 128 .bLength = UAC_DT_OUTPUT_TERMINAL_SIZE,
129 .bDescriptorType = USB_DT_CS_INTERFACE, 129 .bDescriptorType = USB_DT_CS_INTERFACE,
130 .bDescriptorSubtype = UAC_OUTPUT_TERMINAL, 130 .bDescriptorSubtype = UAC_OUTPUT_TERMINAL,
@@ -154,7 +154,7 @@ static struct usb_interface_descriptor as_interface_alt_1_desc = {
154}; 154};
155 155
156/* B.4.2 Class-Specific AS Interface Descriptor */ 156/* B.4.2 Class-Specific AS Interface Descriptor */
157static struct uac_as_header_descriptor as_header_desc = { 157static struct uac_as_header_descriptor_v1 as_header_desc = {
158 .bLength = UAC_DT_AS_HEADER_SIZE, 158 .bLength = UAC_DT_AS_HEADER_SIZE,
159 .bDescriptorType = USB_DT_CS_INTERFACE, 159 .bDescriptorType = USB_DT_CS_INTERFACE,
160 .bDescriptorSubtype = UAC_AS_GENERAL, 160 .bDescriptorSubtype = UAC_AS_GENERAL,
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index d0b1e836f0e0..5f6a2e0a9357 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -237,7 +237,7 @@ static const struct usb_interface_descriptor ac_interface_desc = {
237}; 237};
238 238
239/* B.3.2 Class-Specific AC Interface Descriptor */ 239/* B.3.2 Class-Specific AC Interface Descriptor */
240static const struct uac_ac_header_descriptor_1 ac_header_desc = { 240static const struct uac_ac_header_descriptor_v1_1 ac_header_desc = {
241 .bLength = UAC_DT_AC_HEADER_SIZE(1), 241 .bLength = UAC_DT_AC_HEADER_SIZE(1),
242 .bDescriptorType = USB_DT_CS_INTERFACE, 242 .bDescriptorType = USB_DT_CS_INTERFACE,
243 .bDescriptorSubtype = USB_MS_HEADER, 243 .bDescriptorSubtype = USB_MS_HEADER,