From 0c250c0eeab1840a2da4b9b6df7611b4efebd38a Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Fri, 13 May 2011 11:59:30 +0200 Subject: [PATCH] staging: brcm80211: fix makefiles for building drivers in kernel 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 Signed-off-by: Greg Kroah-Hartman --- 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 8c9c0dcdb33e..c5ec562c3645 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 84ae24534f9f..8d75fe19ca9a 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) -- 2.39.5