aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-06-09 18:53:58 +0200
committerBen Hutchings <ben@decadent.org.uk>2013-07-27 05:34:09 +0100
commit51f2a0a803cd9cf31401610f40d5ab452b2b7e0a (patch)
treed6a62ae03c552e67840955c438cdbc544e5decad
parentc2ecb14d22b1e99a9dcdef8d20a37762c45e6e67 (diff)
downloadkernel_samsung_smdk4412-51f2a0a803cd9cf31401610f40d5ab452b2b7e0a.zip
kernel_samsung_smdk4412-51f2a0a803cd9cf31401610f40d5ab452b2b7e0a.tar.gz
kernel_samsung_smdk4412-51f2a0a803cd9cf31401610f40d5ab452b2b7e0a.tar.bz2
b43: ensue that BCMA is "y" when B43 is "y"
commit 693026ef2e751fd94d2e6c71028e68343cc875d5 upstream. When b43 gets build into the kernel and it should use bcma we have to ensure that bcma was also build into the kernel and not as a module. In this patch this is also done for SSB, although you can not build b43 without ssb support for now. This fixes a build problem reported by Randy Dunlap in 5187EB95.2060605@infradead.org Reported-By: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/net/wireless/b43/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index b97a40e..36a7ce3 100644
--- a/drivers/net/wireless/b43/Kconfig
+++ b/drivers/net/wireless/b43/Kconfig
@@ -28,12 +28,12 @@ config B43
config B43_BCMA
bool "Support for BCMA bus"
- depends on B43 && BCMA
+ depends on B43 && (BCMA = y || BCMA = B43)
default y
config B43_SSB
bool
- depends on B43 && SSB
+ depends on B43 && (SSB = y || SSB = B43)
default y
# Auto-select SSB PCI-HOST support, if possible