Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd305ad4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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
parents 19b9a83e b193b412

drivers/usb/musb/musb_core.h

+9 −8
Original line number Original line Diff line number Diff line
@@ -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