Commit b84f7b3f authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by Greg Kroah-Hartman

b43: ensue that BCMA is "y" when B43 is "y"

commit 693026ef 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: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ebfc049c
...@@ -28,7 +28,7 @@ config B43 ...@@ -28,7 +28,7 @@ config B43
config B43_BCMA config B43_BCMA
bool "Support for BCMA bus" bool "Support for BCMA bus"
depends on B43 && BCMA depends on B43 && (BCMA = y || BCMA = B43)
default y default y
config B43_BCMA_EXTRA config B43_BCMA_EXTRA
...@@ -39,7 +39,7 @@ config B43_BCMA_EXTRA ...@@ -39,7 +39,7 @@ config B43_BCMA_EXTRA
config B43_SSB config B43_SSB
bool bool
depends on B43 && SSB depends on B43 && (SSB = y || SSB = B43)
default y default y
# Auto-select SSB PCI-HOST support, if possible # Auto-select SSB PCI-HOST support, if possible
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment