diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-10-25 14:33:47 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-10-25 14:33:47 +0000 |
commit | dca633f1c8441e0c3f47662c1dc51e29f0c0fa94 (patch) | |
tree | 27e003a7e97a51f3e46207657be07de2c205e910 /target/linux/brcm47xx/patches-3.3/280-activate_ssb_support_in_usb.patch | |
parent | f911fb32feca42396c09ebf0042b99e207cd7c48 (diff) | |
download | master-31e0f0ae-dca633f1c8441e0c3f47662c1dc51e29f0c0fa94.tar.gz master-31e0f0ae-dca633f1c8441e0c3f47662c1dc51e29f0c0fa94.tar.bz2 master-31e0f0ae-dca633f1c8441e0c3f47662c1dc51e29f0c0fa94.zip |
kernel: update bcma and ssb to master-2012-10-18 from wireless-testing
* update the flash driver for bcm47xx to use the stubs already in bcma
* do some misc enhancements to the flash drivers for bcm47xx
SVN-Revision: 33920
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/280-activate_ssb_support_in_usb.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.3/280-activate_ssb_support_in_usb.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/280-activate_ssb_support_in_usb.patch b/target/linux/brcm47xx/patches-3.3/280-activate_ssb_support_in_usb.patch index c535c05db5..8b858e11ba 100644 --- a/target/linux/brcm47xx/patches-3.3/280-activate_ssb_support_in_usb.patch +++ b/target/linux/brcm47xx/patches-3.3/280-activate_ssb_support_in_usb.patch @@ -11,12 +11,12 @@ This prevents the options from being delete with make kernel_oldconfig. depends on BCMA_DRIVER_MIPS + select USB_HCD_BCMA if USB_EHCI_HCD || USB_OHCI_HCD - config BCMA_SFLASH - bool + config BCMA_DRIVER_MIPS + bool "BCMA Broadcom MIPS core driver" --- a/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig -@@ -147,6 +147,7 @@ config SSB_SFLASH - config SSB_EMBEDDED +@@ -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 |