openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Greg Kroah-Hartman 2011-02-17 14:09:43 -08:00
parent 19b9a83e21 b193b412e6
commit dd305ad4c5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/usb/musb/musb_core.h
View File

@ -488,6 +488,15 @@ struct musb {
unsigned set_address:1; unsigned set_address:1;
unsigned test_mode:1; unsigned test_mode:1;
unsigned softconnect: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. * FIXME: Remove this flag.
* *
@ -501,14 +510,6 @@ struct musb {
*/ */
unsigned double_buffer_not_ok:1 __deprecated; 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; struct musb_hdrc_config *config;
#ifdef MUSB_CONFIG_PROC_FS #ifdef MUSB_CONFIG_PROC_FS