From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130911042856.757671831@goodmis.org> Date: Wed, 11 Sep 2013 00:27:34 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Randy Dunlap , Hauke Mehrtens , "John W. Linville" Subject: [027/251] b43: ensue that BCMA is "y" when B43 is "y" References: <20130911042707.738353451@goodmis.org> Content-Disposition: inline; filename=0027-b43-ensue-that-BCMA-is-y-when-B43-is-y.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Hauke Mehrtens [ Upstream commit 693026ef2e751fd94d2e6c71028e68343cc875d5 ] 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 Cc: Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville Signed-off-by: Steven Rostedt --- drivers/net/wireless/b43/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig index 3876c7e..af40211 100644 --- a/drivers/net/wireless/b43/Kconfig +++ b/drivers/net/wireless/b43/Kconfig @@ -28,7 +28,7 @@ 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_BCMA_EXTRA @@ -39,7 +39,7 @@ config B43_BCMA_EXTRA 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 -- 1.7.10.4