linux-next: manual merge of the usb tree with the arm tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/Kconfig between commit
760efe6910d5743084b586d3d0a3b65aea96fb2f ("USB: cns3xxx: Add EHCI and
OHCI bus glue for cns3xxx SOCs") from the arm tree and commits
c8c38de9d8002578599222296b90696745ac0fe3 ("USB host: Adding USB ehci &
ohci support for spear platform") and
b0848aea10da186372582f33152efdda43944f26 ("USB: EHCI: Add MSM Host
Controller driver") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/Kconfig
index 5a7c8f1,b8e70a9..0000000
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@@ -41,7 -41,7 +41,8 @@@ config USB_ARCH_HAS_OHC
  	default y if MFD_TC6393XB
  	default y if ARCH_W90X900
  	default y if ARCH_DAVINCI_DA8XX
 +	default y if ARCH_CNS3XXX
+ 	default y if PLAT_SPEAR
  	# PPC:
  	default y if STB03xxx
  	default y if PPC_MPC52xx
@@@ -67,7 -62,9 +63,10 @@@ config USB_ARCH_HAS_EHC
  	default y if ARCH_AT91SAM9G45
  	default y if ARCH_MXC
  	default y if ARCH_OMAP3
 +	default y if ARCH_CNS3XXX
+ 	default y if ARCH_VT8500
+ 	default y if PLAT_SPEAR
+ 	default y if ARCH_MSM
  	default PCI
  
  # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/