From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 04:38:04 +0000 (+1100)
Subject: Merge remote-tracking branch 'usb/usb-next'
X-Git-Tag: next-20130220~27
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=913bd6974a339f7d71b300d2f5c3c01a87870395;p=karo-tx-linux.git

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

Conflicts:
	drivers/usb/gadget/Kconfig
	drivers/usb/host/ehci-vt8500.c
	drivers/usb/musb/omap2430.c
	drivers/usb/phy/omap-usb2.c
---

913bd6974a339f7d71b300d2f5c3c01a87870395
diff --cc drivers/usb/gadget/Kconfig
index a1bd951f9cb7,c5c6fa60910d..5a0c541daf89
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@@ -750,7 -762,8 +762,9 @@@ config USB_GADGET_TARGE
  
  config USB_G_SERIAL
  	tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"
 +	depends on TTY
+ 	select USB_U_SERIAL
+ 	select USB_F_ACM
  	select USB_LIBCOMPOSITE
  	help
  	  The Serial Gadget talks to the Linux-USB generic serial driver.
diff --cc drivers/usb/host/ehci-vt8500.c
index 7ecf709610ba,98d65bdcb969..feccea02cb51
--- a/drivers/usb/host/ehci-vt8500.c
+++ b/drivers/usb/host/ehci-vt8500.c
@@@ -16,7 -16,12 +16,13 @@@
   *
   */
  
 +#include <linux/err.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/usb.h>
+ #include <linux/usb/hcd.h>
+ #include <linux/io.h>
+ #include <linux/dma-mapping.h>
  #include <linux/of.h>
  #include <linux/platform_device.h>