diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-10 14:10:14 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-10 14:10:14 +1000 |
| commit | 2f03c554a1682a4d6268ef9cd63da592fe6f21b9 (patch) | |
| tree | 11adc3f7fd144488fccc1f228ea02b9a27ccb99f /drivers/staging/Makefile | |
| parent | 78b22b0fa73a440375f71d2717b60f2e943ef3c9 (diff) | |
| parent | dc762c4f8514f23094927e0a62ef305d90651535 (diff) | |
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/rt2860/common/cmm_data_pci.c
drivers/staging/rt2860/common/cmm_data_usb.c
Diffstat (limited to 'drivers/staging/Makefile')
| -rw-r--r-- | drivers/staging/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index f0d5c5315612..7d38925d585a 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -16,9 +16,8 @@ obj-$(CONFIG_USB_IP_COMMON) += usbip/ obj-$(CONFIG_W35UND) += winbond/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_ECHO) += echo/ -obj-$(CONFIG_BRCM80211) += brcm80211/ -obj-$(CONFIG_RT2860) += rt2860/ -obj-$(CONFIG_RT2870) += rt2870/ +obj-$(CONFIG_BRCMSMAC) += brcm80211/ +obj-$(CONFIG_BRCMFMAC) += brcm80211/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/ obj-$(CONFIG_ASUS_OLED) += asus_oled/ |