From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Tue, 12 May 2009 22:02:19 +0000 (+0000)
Subject: Activate CONFIG_USB_EHCI_HCD_SSB and CONFIG_USB_OHCI_HCD_SSB only on brcm47xx.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=81ebf13b9ea73b9eed903f9b79119fb117ba8723;p=openwrt%2Fstaging%2Fadrian.git

Activate CONFIG_USB_EHCI_HCD_SSB and CONFIG_USB_OHCI_HCD_SSB only on brcm47xx.

SVN-Revision: 15807
---

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 9ba2c19906..b0dd0c6c80 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -139,7 +139,6 @@ define KernelPackage/usb2
   $(call usbdep,)
   TITLE:=Support for USB2 controllers
   KCONFIG:=CONFIG_USB_EHCI_HCD \
-    CONFIG_USB_EHCI_HCD_SSB=y \
     CONFIG_USB_EHCI_AR71XX=y
   FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,ehci-hcd)
diff --git a/target/linux/brcm47xx/config-2.6.28 b/target/linux/brcm47xx/config-2.6.28
index 32712215df..a47339c14c 100644
--- a/target/linux/brcm47xx/config-2.6.28
+++ b/target/linux/brcm47xx/config-2.6.28
@@ -178,6 +178,8 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 # CONFIG_TC35815 is not set
 CONFIG_TICK_ONESHOT=y
 CONFIG_TRAD_SIGNALS=y
+CONFIG_USB_EHCI_HCD_SSB=y
+CONFIG_USB_OHCI_HCD_SSB=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
diff --git a/target/linux/brcm47xx/patches-2.6.28/280-activate_ssb_support_in_usb.patch b/target/linux/brcm47xx/patches-2.6.28/280-activate_ssb_support_in_usb.patch
new file mode 100644
index 0000000000..b311e52afd
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.28/280-activate_ssb_support_in_usb.patch
@@ -0,0 +1,12 @@
+This prevents the options from being delete with make kernel_oldconfig.
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -126,6 +126,8 @@ config SSB_DRIVER_MIPS
+ config SSB_EMBEDDED
+ 	bool
+ 	depends on SSB_DRIVER_MIPS
++	select USB_EHCI_HCD_SSB
++	select USB_OHCI_HCD_SSB
+ 	default y
+ 
+ config SSB_DRIVER_EXTIF