diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:09:43 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:09:51 -0800 |
| commit | dd305ad4c5d6bfacf7cb087aaaf6dd3f8a18b292 (patch) | |
| tree | 71dc7909023dd632a100a535a76d7ae4edb8cef4 /drivers/usb | |
| parent | 19b9a83e214d3d3ac52a56daca5ea0d033ca47bc (diff) | |
| parent | b193b412e62b134adf69af286c7e7f8e99259350 (diff) | |
Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus
* 'for-greg' of git://gitorious.org/usb/usb:
usb: musb: omap2430: fix kernel panic on reboot
usb: musb: fix build breakage
Diffstat (limited to 'drivers/usb')
| -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 d74a8113ae7..e6400be8a0f 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 |