diff options
| author | Felipe Balbi <balbi@ti.com> | 2011-02-11 09:00:02 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2011-02-17 13:34:17 +0100 |
| commit | 5990378b393429244559f4750f2ee3a50929b932 (patch) | |
| tree | 2e88c340cf02700a5884423f4f3c10d4a43817c8 /drivers | |
| parent | Linux 2.6.38-rc5 (diff) | |
| download | linux-5990378b393429244559f4750f2ee3a50929b932.tar.xz linux-5990378b393429244559f4750f2ee3a50929b932.zip | |
usb: musb: fix build breakage
commit 0662481855c389b75a0a54c32870cc90563d80a9
(usb: musb: disable double buffering when it's broken),
introduced a compile error when gadget API is disabled.
Fix it.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/musb/musb_core.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index d74a8113ae74..e6400be8a0f8 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -488,6 +488,15 @@ struct musb { unsigned set_address:1; unsigned test_mode:1; unsigned softconnect:1; + + u8 address; + u8 test_mode_nr; + u16 ackpend; /* ep0 */ + enum musb_g_ep0_state ep0_state; + struct usb_gadget g; /* the gadget */ + struct usb_gadget_driver *gadget_driver; /* its driver */ +#endif + /* * FIXME: Remove this flag. * @@ -501,14 +510,6 @@ struct musb { */ unsigned double_buffer_not_ok:1 __deprecated; - u8 address; - u8 test_mode_nr; - u16 ackpend; /* ep0 */ - enum musb_g_ep0_state ep0_state; - struct usb_gadget g; /* the gadget */ - struct usb_gadget_driver *gadget_driver; /* its driver */ -#endif - struct musb_hdrc_config *config; #ifdef MUSB_CONFIG_PROC_FS |