diff options
| author | Arend van Spriel <[email protected]> | 2011-05-13 11:59:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2011-05-17 12:03:52 -0700 |
| commit | 0c250c0eeab1840a2da4b9b6df7611b4efebd38a (patch) | |
| tree | a0c64c792fc2977279d5ab75e87afc3623583b76 | |
| parent | 755f609cb3f64c6b5d25979c805fae16c4cc0c33 (diff) | |
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: [email protected]
Cc: [email protected]
Reviewed-by: Roland Vossen <[email protected]>
Reviewed-by: Henry Ptasinski <[email protected]>
Reviewed-by: Brett Rudley <[email protected]>
Signed-off-by: Arend van Spriel <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/Makefile | 2 | ||||
| -rw-r--r-- | 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) |