From: Thierry Reding <treding@nvidia.com>
Date: Thu, 24 Oct 2013 12:59:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'usb-gadget/next'
X-Git-Tag: next-20131024~30
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=1f4cc4a22c3dbb50e46728b8907271a03d202cb0

Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
	drivers/usb/musb/davinci.c
---

1f4cc4a22c3dbb50e46728b8907271a03d202cb0
diff --cc include/linux/usb/usb_phy_gen_xceiv.h
index 11d85b9c1b08,42f3b71a9775..cc8d818a83be
--- a/include/linux/usb/usb_phy_gen_xceiv.h
+++ b/include/linux/usb/usb_phy_gen_xceiv.h
@@@ -9,10 -9,11 +9,11 @@@ struct usb_phy_gen_xceiv_platform_data 
  
  	/* if set fails with -EPROBE_DEFER if can't get regulator */
  	unsigned int needs_vcc:1;
- 	unsigned int needs_reset:1;
+ 	unsigned int needs_reset:1;	/* deprecated */
+ 	int gpio_reset;
  };
  
 -#if IS_ENABLED(CONFIG_NOP_USB_XCEIV)
 +#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
  /* sometimes transceivers are accessed only through e.g. ULPI */
  extern void usb_nop_xceiv_register(void);
  extern void usb_nop_xceiv_unregister(void);