aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-06-09 15:13:18 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-06-09 15:13:18 +0000
commit1acfc775d626c4b3dd9960b25537d912463d5cfe (patch)
treee5dad7c780683d73389c235387a799904d898bde /package/kernel
parent0fb87699bd03c072b17f0a23f3c9be9e8a711bc7 (diff)
downloadupstream-1acfc775d626c4b3dd9960b25537d912463d5cfe.tar.gz
upstream-1acfc775d626c4b3dd9960b25537d912463d5cfe.tar.bz2
upstream-1acfc775d626c4b3dd9960b25537d912463d5cfe.zip
kernel: mac80211: bcm53xx has bcma built-in
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 45933
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/linux/modules/other.mk2
-rw-r--r--package/kernel/mac80211/Makefile6
2 files changed, 4 insertions, 4 deletions
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 6ca9f5e140..77a8bff85a 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/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 \
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 2a40bb1933..2af5d39f0a 100644
--- a/package/kernel/mac80211/Makefile
+++ b/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