summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.6/280-activate_ssb_support_in_usb.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-11-18 21:27:00 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-11-18 21:27:00 +0000
commit86cc79ac985ffd954d26c88d144b82063a714636 (patch)
treed750f1c9a309e6ff92cdd4233d6b9749ce2bc996 /target/linux/brcm47xx/patches-3.6/280-activate_ssb_support_in_usb.patch
parentd648dad7fa7708a1879579ac6a6e87825eccd028 (diff)
downloadmaster-31e0f0ae-86cc79ac985ffd954d26c88d144b82063a714636.tar.gz
master-31e0f0ae-86cc79ac985ffd954d26c88d144b82063a714636.tar.bz2
master-31e0f0ae-86cc79ac985ffd954d26c88d144b82063a714636.zip
brcm47xx: add support for kernel 3.6
This is based on the patch by Peter Wagner. SVN-Revision: 34252
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/280-activate_ssb_support_in_usb.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.6/280-activate_ssb_support_in_usb.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/280-activate_ssb_support_in_usb.patch b/target/linux/brcm47xx/patches-3.6/280-activate_ssb_support_in_usb.patch
new file mode 100644
index 0000000000..8b858e11ba
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.6/280-activate_ssb_support_in_usb.patch
@@ -0,0 +1,25 @@
+This prevents the options from being delete with make kernel_oldconfig.
+---
+ drivers/ssb/Kconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/bcma/Kconfig
++++ b/drivers/bcma/Kconfig
+@@ -37,6 +37,7 @@ config BCMA_DRIVER_PCI_HOSTMODE
+ config BCMA_HOST_SOC
+ bool
+ depends on BCMA_DRIVER_MIPS
++ select USB_HCD_BCMA if USB_EHCI_HCD || USB_OHCI_HCD
+
+ config BCMA_DRIVER_MIPS
+ bool "BCMA Broadcom MIPS core driver"
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -146,6 +146,7 @@ config SSB_EMBEDDED
+ config SSB_SFLASH
+ bool
+ depends on SSB_DRIVER_MIPS
++ select USB_HCD_SSB if USB_EHCI_HCD || USB_OHCI_HCD
+ default y
+
+ config SSB_DRIVER_EXTIF