summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-12 22:02:19 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-12 22:02:19 +0000
commit1b99239fe355e517597fe85ec1df977414bbbc4c (patch)
tree0a5e3723d52d03f0aeb55059aca2dbe63d508060
parent9cc88f31c271c983c5b0fe90e2e12bdac0844b92 (diff)
[brcm47xx] Activate CONFIG_USB_EHCI_HCD_SSB and CONFIG_USB_OHCI_HCD_SSB only on brcm47xx.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15807 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/usb.mk1
-rw-r--r--target/linux/brcm47xx/config-2.6.282
-rw-r--r--target/linux/brcm47xx/patches-2.6.28/280-activate_ssb_support_in_usb.patch12
3 files changed, 14 insertions, 1 deletions
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 9ba2c1990..b0dd0c6c8 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 32712215d..a47339c14 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 000000000..b311e52af
--- /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