Browse Source

kernel: mac80211: bcm53xx has bcma built-in

Signed-off-by: Rafał Miłecki <[email protected]>

SVN-Revision: 45933
Rafał Miłecki 10 years ago
parent
commit
1acfc775d6
2 changed files with 4 additions and 4 deletions
  1. 1 1
      package/kernel/linux/modules/other.mk
  2. 3 3
      package/kernel/mac80211/Makefile

+ 1 - 1
package/kernel/linux/modules/other.mk

@@ -434,7 +434,7 @@ $(eval $(call KernelPackage,ssb))
 define KernelPackage/bcma
   SUBMENU:=$(OTHER_MENU)
   TITLE:=BCMA support
-  DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx
+  DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx @!TARGET_bcm53xx
   KCONFIG:=\
 	CONFIG_BCMA \
 	CONFIG_BCMA_POSSIBLE=y \

+ 3 - 3
package/kernel/mac80211/Makefile

@@ -1140,7 +1140,7 @@ config PACKAGE_B43_USE_SSB
 config PACKAGE_B43_USE_BCMA
 	select PACKAGE_kmod-bcma
 	tristate
-	depends on !TARGET_brcm47xx
+	depends on !TARGET_brcm47xx && !TARGET_bcm53xx
 	default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA_AND_SSB
 	default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA
 
@@ -1263,7 +1263,7 @@ config PACKAGE_B43_USE_BCMA
 		  This allows choosing buses that b43 should support.
 
 	config PACKAGE_B43_BUSES_BCMA_AND_SSB
-		depends on !TARGET_brcm47xx_legacy && !TARGET_brcm47xx_mips74k
+		depends on !TARGET_brcm47xx_legacy && !TARGET_brcm47xx_mips74k && !TARGET_bcm53xx
 		bool "BCMA and SSB"
 
 	config PACKAGE_B43_BUSES_BCMA
@@ -1271,7 +1271,7 @@ config PACKAGE_B43_USE_BCMA
 		bool "BCMA only"
 
 	config PACKAGE_B43_BUSES_SSB
-		depends on !TARGET_brcm47xx_mips74k
+		depends on !TARGET_brcm47xx_mips74k && !TARGET_bcm53xx
 		bool "SSB only"
 
 	endchoice