diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/gadget/ether.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/gadget_chips.h | 10 | ||||
-rw-r--r-- | drivers/usb/gadget/inode.c | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 49630ab569bf..78e2402e7b2c 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c | |||
@@ -292,7 +292,7 @@ MODULE_PARM_DESC(host_addr, "Host Ethernet Address"); | |||
292 | #define DEV_CONFIG_SUBSET | 292 | #define DEV_CONFIG_SUBSET |
293 | #endif | 293 | #endif |
294 | 294 | ||
295 | #ifdef CONFIG_USB_GADGET_SH | 295 | #ifdef CONFIG_USB_GADGET_SUPERH |
296 | #define DEV_CONFIG_SUBSET | 296 | #define DEV_CONFIG_SUBSET |
297 | #endif | 297 | #endif |
298 | 298 | ||
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h index 96f50e35819f..9c84b385ca88 100644 --- a/drivers/usb/gadget/gadget_chips.h +++ b/drivers/usb/gadget/gadget_chips.h | |||
@@ -8,6 +8,8 @@ | |||
8 | * (And avoiding all runtime comparisons in typical one-choice configs!) | 8 | * (And avoiding all runtime comparisons in typical one-choice configs!) |
9 | * | 9 | * |
10 | * NOTE: some of these controller drivers may not be available yet. | 10 | * NOTE: some of these controller drivers may not be available yet. |
11 | * Some are available on 2.4 kernels; several are available, but not | ||
12 | * yet pushed in the 2.6 mainline tree. | ||
11 | */ | 13 | */ |
12 | #ifdef CONFIG_USB_GADGET_NET2280 | 14 | #ifdef CONFIG_USB_GADGET_NET2280 |
13 | #define gadget_is_net2280(g) !strcmp("net2280", (g)->name) | 15 | #define gadget_is_net2280(g) !strcmp("net2280", (g)->name) |
@@ -33,12 +35,14 @@ | |||
33 | #define gadget_is_goku(g) 0 | 35 | #define gadget_is_goku(g) 0 |
34 | #endif | 36 | #endif |
35 | 37 | ||
38 | /* SH3 UDC -- not yet ported 2.4 --> 2.6 */ | ||
36 | #ifdef CONFIG_USB_GADGET_SUPERH | 39 | #ifdef CONFIG_USB_GADGET_SUPERH |
37 | #define gadget_is_sh(g) !strcmp("sh_udc", (g)->name) | 40 | #define gadget_is_sh(g) !strcmp("sh_udc", (g)->name) |
38 | #else | 41 | #else |
39 | #define gadget_is_sh(g) 0 | 42 | #define gadget_is_sh(g) 0 |
40 | #endif | 43 | #endif |
41 | 44 | ||
45 | /* not yet stable on 2.6 (would help "original Zaurus") */ | ||
42 | #ifdef CONFIG_USB_GADGET_SA1100 | 46 | #ifdef CONFIG_USB_GADGET_SA1100 |
43 | #define gadget_is_sa1100(g) !strcmp("sa1100_udc", (g)->name) | 47 | #define gadget_is_sa1100(g) !strcmp("sa1100_udc", (g)->name) |
44 | #else | 48 | #else |
@@ -51,6 +55,7 @@ | |||
51 | #define gadget_is_lh7a40x(g) 0 | 55 | #define gadget_is_lh7a40x(g) 0 |
52 | #endif | 56 | #endif |
53 | 57 | ||
58 | /* handhelds.org tree (?) */ | ||
54 | #ifdef CONFIG_USB_GADGET_MQ11XX | 59 | #ifdef CONFIG_USB_GADGET_MQ11XX |
55 | #define gadget_is_mq11xx(g) !strcmp("mq11xx_udc", (g)->name) | 60 | #define gadget_is_mq11xx(g) !strcmp("mq11xx_udc", (g)->name) |
56 | #else | 61 | #else |
@@ -63,12 +68,14 @@ | |||
63 | #define gadget_is_omap(g) 0 | 68 | #define gadget_is_omap(g) 0 |
64 | #endif | 69 | #endif |
65 | 70 | ||
71 | /* not yet ported 2.4 --> 2.6 */ | ||
66 | #ifdef CONFIG_USB_GADGET_N9604 | 72 | #ifdef CONFIG_USB_GADGET_N9604 |
67 | #define gadget_is_n9604(g) !strcmp("n9604_udc", (g)->name) | 73 | #define gadget_is_n9604(g) !strcmp("n9604_udc", (g)->name) |
68 | #else | 74 | #else |
69 | #define gadget_is_n9604(g) 0 | 75 | #define gadget_is_n9604(g) 0 |
70 | #endif | 76 | #endif |
71 | 77 | ||
78 | /* various unstable versions available */ | ||
72 | #ifdef CONFIG_USB_GADGET_PXA27X | 79 | #ifdef CONFIG_USB_GADGET_PXA27X |
73 | #define gadget_is_pxa27x(g) !strcmp("pxa27x_udc", (g)->name) | 80 | #define gadget_is_pxa27x(g) !strcmp("pxa27x_udc", (g)->name) |
74 | #else | 81 | #else |
@@ -93,6 +100,7 @@ | |||
93 | #define gadget_is_at91(g) 0 | 100 | #define gadget_is_at91(g) 0 |
94 | #endif | 101 | #endif |
95 | 102 | ||
103 | /* status unclear */ | ||
96 | #ifdef CONFIG_USB_GADGET_IMX | 104 | #ifdef CONFIG_USB_GADGET_IMX |
97 | #define gadget_is_imx(g) !strcmp("imx_udc", (g)->name) | 105 | #define gadget_is_imx(g) !strcmp("imx_udc", (g)->name) |
98 | #else | 106 | #else |
@@ -106,6 +114,7 @@ | |||
106 | #endif | 114 | #endif |
107 | 115 | ||
108 | /* Mentor high speed function controller */ | 116 | /* Mentor high speed function controller */ |
117 | /* from Montavista kernel (?) */ | ||
109 | #ifdef CONFIG_USB_GADGET_MUSBHSFC | 118 | #ifdef CONFIG_USB_GADGET_MUSBHSFC |
110 | #define gadget_is_musbhsfc(g) !strcmp("musbhsfc_udc", (g)->name) | 119 | #define gadget_is_musbhsfc(g) !strcmp("musbhsfc_udc", (g)->name) |
111 | #else | 120 | #else |
@@ -119,6 +128,7 @@ | |||
119 | #define gadget_is_musbhdrc(g) 0 | 128 | #define gadget_is_musbhdrc(g) 0 |
120 | #endif | 129 | #endif |
121 | 130 | ||
131 | /* from Montavista kernel (?) */ | ||
122 | #ifdef CONFIG_USB_GADGET_MPC8272 | 132 | #ifdef CONFIG_USB_GADGET_MPC8272 |
123 | #define gadget_is_mpc8272(g) !strcmp("mpc8272_udc", (g)->name) | 133 | #define gadget_is_mpc8272(g) !strcmp("mpc8272_udc", (g)->name) |
124 | #else | 134 | #else |
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index 46d0e5252744..23b439ab774c 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c | |||
@@ -1505,7 +1505,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) | |||
1505 | } | 1505 | } |
1506 | break; | 1506 | break; |
1507 | 1507 | ||
1508 | #ifndef CONFIG_USB_GADGETFS_PXA2XX | 1508 | #ifndef CONFIG_USB_GADGET_PXA2XX |
1509 | /* PXA automagically handles this request too */ | 1509 | /* PXA automagically handles this request too */ |
1510 | case USB_REQ_GET_CONFIGURATION: | 1510 | case USB_REQ_GET_CONFIGURATION: |
1511 | if (ctrl->bRequestType != 0x80) | 1511 | if (ctrl->bRequestType != 0x80) |