| From: Hauke Mehrtens <hauke@hauke-m.de> |
| Date: Sun, 9 Jun 2013 18:53:58 +0200 |
| Subject: 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> |
| --- |
| drivers/net/wireless/b43/Kconfig | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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 |
