From patchwork Fri May 13 09:59:30 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: 782262 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4DA0I1U015244 for ; Fri, 13 May 2011 10:00:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758766Ab1EMKAN (ORCPT ); Fri, 13 May 2011 06:00:13 -0400 Received: from mms2.broadcom.com ([216.31.210.18]:4887 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753986Ab1EMKAK (ORCPT ); Fri, 13 May 2011 06:00:10 -0400 Received: from [10.9.200.131] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Fri, 13 May 2011 03:03:33 -0700 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 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; Fri, 13 May 2011 02:59:55 -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 6E8AB74D04; Fri, 13 May 2011 02:59:55 -0700 (PDT) Received: from arend-laptop (unknown [10.176.68.140]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id C9DF220507; Fri, 13 May 2011 02:59:54 -0700 (PDT) Received: from arend by arend-laptop with local (Exim 4.74) ( envelope-from ) id 1QKpA1-0002UK-SX; Fri, 13 May 2011 11:59:53 +0200 From: "Arend van Spriel" To: gregkh@suse.de cc: "Arend van Spriel" , devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 10/32] staging: brcm80211: fix makefiles for building drivers in kernel Date: Fri, 13 May 2011 11:59:30 +0200 Message-ID: <1305280792-9475-10-git-send-email-arend@broadcom.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1305280792-9475-1-git-send-email-arend@broadcom.com> References: <1305280792-9475-1-git-send-email-arend@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 61D3DE7F3IC954935-01-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 (demeter2.kernel.org [140.211.167.43]); Fri, 13 May 2011 10:00:19 +0000 (UTC) The makefiles used obj-m which forcibly builds the drivers as modules ignoring the Kconfig setting. This has been fixed in this patch. Cc: devel@linuxdriverproject.org Cc: linux-wireless@vger.kernel.org Reviewed-by: Roland Vossen Reviewed-by: Henry Ptasinski Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel --- drivers/staging/brcm80211/brcmfmac/Makefile | 2 +- drivers/staging/brcm80211/brcmsmac/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile index 8c9c0dc..c5ec562 100644 --- a/drivers/staging/brcm80211/brcmfmac/Makefile +++ b/drivers/staging/brcm80211/brcmfmac/Makefile @@ -52,5 +52,5 @@ DHDOFILES = \ bcmsdh_sdmmc.o \ bcmsdh_sdmmc_linux.o -obj-m += brcmfmac.o +obj-$(CONFIG_BRCMFMAC) += brcmfmac.o brcmfmac-objs += $(DHDOFILES) diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile index 84ae245..8d75fe1 100644 --- a/drivers/staging/brcm80211/brcmsmac/Makefile +++ b/drivers/staging/brcm80211/brcmsmac/Makefile @@ -55,5 +55,5 @@ BRCMSMAC_OFILES := \ MODULEPFX := brcmsmac -obj-m += $(MODULEPFX).o +obj-$(CONFIG_BRCMSMAC) += $(MODULEPFX).o $(MODULEPFX)-objs = $(BRCMSMAC_OFILES)