From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 19 Apr 2011 12:50:26 +0000 (-0700)
Subject: Merge 2.6.39-rc4 into usb-next
X-Git-Tag: v3.0-rc1~337^2~138
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=50ee9339c7347c2b16fa79d43777f72e9f41ef5a;p=~emulex%2Finfiniband.git

Merge 2.6.39-rc4 into usb-next

This is needed to help resolve some xhci issues and other minor
differences.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

50ee9339c7347c2b16fa79d43777f72e9f41ef5a
diff --cc drivers/usb/Kconfig
index 006489d82dc,cf7614d29f0..a1b3750cadb
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@@ -65,8 -65,8 +65,9 @@@ config USB_ARCH_HAS_EHC
  	default y if ARCH_CNS3XXX
  	default y if ARCH_VT8500
  	default y if PLAT_SPEAR
+ 	default y if PLAT_S5P
  	default y if ARCH_MSM
 +	default y if MICROBLAZE
  	default PCI
  
  # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.