From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 20 Nov 2014 13:42:02 +0000 (+0100)
Subject: Merge Linus' tree to be be to apply submitted patches to newer code than
X-Git-Tag: v3.19-rc1~106^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a02001086bbfb4da35d1228bebc2f1b442db455f;p=thirdparty%2Fkernel%2Flinux.git

Merge Linus' tree to be be to apply submitted patches to newer code than
current trivial.git base
---

a02001086bbfb4da35d1228bebc2f1b442db455f
diff --cc arch/powerpc/platforms/44x/Kconfig
index 54835e61997b8,82f2da28cd277..d2ac1c1164546
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@@ -215,11 -215,12 +215,11 @@@ config AKEBON
  	select NET_VENDOR_IBM
  	select IBM_EMAC_EMAC4
  	select IBM_EMAC_RGMII_WOL
- 	select USB
- 	select USB_OHCI_HCD_PLATFORM
- 	select USB_EHCI_HCD_PLATFORM
+ 	select USB if USB_SUPPORT
+ 	select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
+ 	select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
  	select MMC_SDHCI
  	select MMC_SDHCI_PLTFM
 -	select MMC_SDHCI_OF_476GTR
  	select ATA
  	select SATA_AHCI_PLATFORM
  	help