From patchwork Tue Aug 23 12:13:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 1088202 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7NCEPYr007395 for ; Tue, 23 Aug 2011 12:14:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754193Ab1HWMOT (ORCPT ); Tue, 23 Aug 2011 08:14:19 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:4699 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752273Ab1HWMOR (ORCPT ); Tue, 23 Aug 2011 08:14:17 -0400 Received: from [10.9.200.131] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Tue, 23 Aug 2011 05:20:08 -0700 X-Server-Uuid: 02CED230-5797-4B57-9875-D5D2FEE4708A Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB01.corp.ad.broadcom.com (10.9.200.131) with Microsoft SMTP Server id 8.2.247.2; Tue, 23 Aug 2011 05:14:04 -0700 Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.17.16.106]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id ECD2D74D06; Tue, 23 Aug 2011 05:14:04 -0700 (PDT) Received: from arend-laptop (unknown [10.176.68.152]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id BBC8220503; Tue, 23 Aug 2011 05:14:02 -0700 (PDT) Received: from arend by arend-laptop with local (Exim 4.74) ( envelope-from ) id 1Qvprl-00016x-0h; Tue, 23 Aug 2011 14:14:01 +0200 From: "Arend van Spriel" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org, "Henry Ptasinski" , "Arend van Spriel" Subject: [PATCH 1/8] staging: brcm80211: only enable brcmsmac if bcma is not set Date: Tue, 23 Aug 2011 14:13:53 +0200 Message-ID: <1314101640-4229-2-git-send-email-arend@broadcom.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314101640-4229-1-git-send-email-arend@broadcom.com> References: <1314101640-4229-1-git-send-email-arend@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 624D45724R01342178-02-01 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 23 Aug 2011 12:14:27 +0000 (UTC) From: Henry Ptasinski brcmsmac doesn't yet use bcma, but both drivers attempt to claim the same device. For now, turn of brcmsmac if bcma is enabled. Signed-off-by: Arend van Spriel --- drivers/staging/brcm80211/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/staging/brcm80211/Kconfig b/drivers/staging/brcm80211/Kconfig index 621570a..ef77b44 100644 --- a/drivers/staging/brcm80211/Kconfig +++ b/drivers/staging/brcm80211/Kconfig @@ -7,6 +7,7 @@ config BRCMSMAC default n depends on PCI depends on WLAN && MAC80211 + depends on BCMA=n select BRCMUTIL select FW_LOADER select CRC_CCITT