From 5d076d85ef331c59ec6d4647ef829884fa21d798 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Fri, 13 May 2011 11:59:30 +0200 Subject: [PATCH] --- yaml --- r: 249633 b: refs/heads/master c: 0c250c0eeab1840a2da4b9b6df7611b4efebd38a h: refs/heads/master i: 249631: 51d5624a49010173c37eb740cb5c28e462c5cdbb v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmfmac/Makefile | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index daab4034b15f..f2692e455371 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 755f609cb3f64c6b5d25979c805fae16c4cc0c33 +refs/heads/master: 0c250c0eeab1840a2da4b9b6df7611b4efebd38a diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/Makefile b/trunk/drivers/staging/brcm80211/brcmfmac/Makefile index 8c9c0dcdb33e..c5ec562c3645 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/Makefile +++ b/trunk/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/trunk/drivers/staging/brcm80211/brcmsmac/Makefile b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile index 84ae24534f9f..8d75fe19ca9a 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile +++ b/trunk/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)