Merge remote-tracking branch 'usb-gadget/next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:59:25 +0000 (14:59 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:59:25 +0000 (14:59 +0200)
Conflicts:
drivers/usb/musb/davinci.c

1  2 
arch/arm/mach-omap2/board-omap3beagle.c
drivers/phy/phy-twl4030-usb.c
drivers/usb/gadget/storage_common.c
drivers/usb/musb/Kconfig
drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_dsps.c
drivers/usb/musb/musb_virthub.c
drivers/usb/musb/omap2430.c
drivers/usb/phy/Kconfig
drivers/usb/phy/Makefile
include/linux/usb/usb_phy_gen_xceiv.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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);