Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[mv-sheeva.git] / drivers / staging / brcm80211 / Makefile

diff --git a/drivers/staging/brcm80211/Makefile b/drivers/staging/brcm80211/Makefile
index 68cbcbbc2e5660e638350f5758c0ac9c24dcd70a..1953ebe3d64bf621eabcc31b60e9199861ccc5a1 100644 (file)
--- a/drivers/staging/brcm80211/Makefile
+++ b/drivers/staging/brcm80211/Makefile
@@ -38,7 +38,6 @@ BRCM80211_OFILES := \
        util/bcmsrom.o \
        util/bcmutils.o \
        util/bcmwifi.o \
-       util/bcmwpa.o \
        util/hndpmu.o \
        util/linux_osl.o \
        sys/wlc_alloc.o \
@@ -67,10 +66,9 @@ PCIFILES := \
 
 MODULEPFX := brcm80211
 
-obj-m  += $(MODULEPFX).o
-
 # PCI driver
 ifeq ($(CONFIG_BRCM80211_PCI),y)
+obj-m  += $(MODULEPFX).o
 ccflags-y += $(PCI_CFLAGS)
 $(MODULEPFX)-objs      = $(BRCM80211_OFILES) $(PCIFILES)
 endif