Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...

[pandora-kernel.git] / drivers / staging / brcm80211 / brcmsmac / Makefile

diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile
index 2179774..8d75fe1 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/Makefile
+++ b/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -25,7 +25,6 @@ ccflags-y :=                          \
        -DBCMNVRAMR                             \
        -Idrivers/staging/brcm80211/brcmsmac \
        -Idrivers/staging/brcm80211/brcmsmac/phy \
-       -Idrivers/staging/brcm80211/util \
        -Idrivers/staging/brcm80211/include
 
 BRCMSMAC_OFILES := \
@@ -48,15 +47,13 @@ BRCMSMAC_OFILES := \
        phy/wlc_phytbl_lcn.o \
        phy/wlc_phytbl_n.o \
        phy/wlc_phy_qmath.o \
-       ../util/bcmutils.o \
-       ../util/bcmwifi.o \
-       ../util/bcmotp.o \
-       ../util/bcmsrom.o \
-       ../util/hnddma.o \
-       ../util/nicpci.o \
-       ../util/nvram/nvram_ro.o
+       bcmotp.o \
+       bcmsrom.o \
+       hnddma.o \
+       nicpci.o \
+       nvram.o
 
 MODULEPFX := brcmsmac
 
-obj-m  += $(MODULEPFX).o
+obj-$(CONFIG_BRCMSMAC) += $(MODULEPFX).o
 $(MODULEPFX)-objs      = $(BRCMSMAC_OFILES)