aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-09-12 22:03:45 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-09-12 22:03:45 +0000
commit86cc5185d198ecfa04e6afb9bfa555cfba734256 (patch)
tree4f7f3241e3055ae7524893da85395d23923af610 /target/linux/brcm47xx
parent6cd1deaeaaf3a5b74c23b4a2ccb9d538382d7944 (diff)
downloadmaster-187ad058-86cc5185d198ecfa04e6afb9bfa555cfba734256.tar.gz
master-187ad058-86cc5185d198ecfa04e6afb9bfa555cfba734256.tar.bz2
master-187ad058-86cc5185d198ecfa04e6afb9bfa555cfba734256.zip
kernel: update bcma and ssb to wireless-testing master-2013-09-09
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37957 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r--target/linux/brcm47xx/patches-3.10/280-activate_ssb_support_in_usb.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/280-activate_ssb_support_in_usb.patch b/target/linux/brcm47xx/patches-3.10/280-activate_ssb_support_in_usb.patch
index aabaf29471..748710f6f8 100644
--- a/target/linux/brcm47xx/patches-3.10/280-activate_ssb_support_in_usb.patch
+++ b/target/linux/brcm47xx/patches-3.10/280-activate_ssb_support_in_usb.patch
@@ -7,12 +7,12 @@ This prevents the options from being delete with make kernel_oldconfig.
+++ b/drivers/bcma/Kconfig
@@ -38,6 +38,7 @@ config BCMA_DRIVER_PCI_HOSTMODE
config BCMA_HOST_SOC
- bool
- depends on BCMA_DRIVER_MIPS
+ bool "Support for BCMA in a SoC"
+ depends on BCMA
+ select USB_HCD_BCMA if USB_EHCI_HCD || USB_OHCI_HCD
-
- config BCMA_DRIVER_MIPS
- bool "BCMA Broadcom MIPS core driver"
+ help
+ Host interface for a Broadcom AIX bus directly mapped into
+ the memory. This only works with the Broadcom SoCs from the
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -146,6 +146,7 @@ config SSB_SFLASH