From patchwork Fri May 18 18:14:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 160146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id ABD38B6FC2 for ; Sat, 19 May 2012 04:15:10 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SVRhY-0007iq-L3; Fri, 18 May 2012 18:14:56 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SVRhW-0007f7-6T for kernel-team@lists.ubuntu.com; Fri, 18 May 2012 18:14:54 +0000 Received: from 64-126-113-183.dyn.everestkc.net ([64.126.113.183] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SVRhV-00084n-Tv for kernel-team@lists.ubuntu.com; Fri, 18 May 2012 18:14:54 +0000 From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] disable CONFIG_B43_BCMA_EXTRA Date: Fri, 18 May 2012 13:14:51 -0500 Message-Id: <1337364891-30892-1-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This option enables support in b43 for wireless devices also supported by brcmsmac. brcmsmac is the preferred choice, so this option should be disabled. Also add a check to the enforcer to ensure it doesn't get turned back on by accident. Signed-off-by: Seth Forshee --- debian.master/config/config.common.ubuntu | 2 +- debian.master/config/enforce | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 95563e9..bf4d3dd 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -508,7 +508,7 @@ CONFIG_B43LEGACY_PCI_AUTOSELECT=y CONFIG_B43LEGACY_PIO=y # CONFIG_B43LEGACY_PIO_MODE is not set CONFIG_B43_BCMA=y -CONFIG_B43_BCMA_EXTRA=y +# CONFIG_B43_BCMA_EXTRA is not set CONFIG_B43_BCMA_PIO=y # CONFIG_B43_DEBUG is not set CONFIG_B43_HWRNG=y diff --git a/debian.master/config/enforce b/debian.master/config/enforce index 4da41d5..9399e23 100644 --- a/debian.master/config/enforce +++ b/debian.master/config/enforce @@ -109,3 +109,8 @@ value CONFIG_EFI_VARS y | !exists CONFIG_EFI_VARS (!exists CONFIG_DRM_PSB | value CONFIG_DRM_PSB n) | \ ((value CONFIG_DRM_PSB y | value CONFIG_DRM_PSB m) & (value CONFIG_STUB_POULSBO n | !exists CONFIG_STUB_POULSBO)) +# Ensure CONFIG_B43_BCMA_EXTRA is disabled if CONFIG_BRCMSMAC is enabled. +# Otherwise b43 and brcmsmac will overlap in the hardware they claim to +# support. +(!exists CONFIG_BRCMSMAC | value CONFIG_BRCMSMAC n) | \ +((value CONFIG_BRCMSMAC y | value CONFIG_BRCMSMAC m) & (value CONFIG_B43_BCMA_EXTRA n | !exists CONFIG_B43_BCMA_EXTRA))