diff --git a/[refs] b/[refs] index 16bfde14afda..504c6915de6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efd89a2204d4086de48673ff7e4d5f537e32e0a5 +refs/heads/master: 76a3ccabf25bc3a52c3377bfdfc3ecc16499180b diff --git a/trunk/drivers/staging/brcm80211/Makefile b/trunk/drivers/staging/brcm80211/Makefile index 68cbcbbc2e56..f65df844a678 100644 --- a/trunk/drivers/staging/brcm80211/Makefile +++ b/trunk/drivers/staging/brcm80211/Makefile @@ -67,10 +67,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