kernel: update bcma and ssb to master-2012-10-18 from wireless-testing

[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-3.3 / 280-activate_ssb_support_in_usb.patch

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 c535c05db550d9d31a98908c2994e035a0387054..8b858e11ba233a119e69c88e517c4617c30b63c5 100644 (file)
--- 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