Merge branch 'tc1100-wmi' into release

[pandora-kernel.git] / drivers / staging / rt2870 / Makefile

diff --git a/drivers/staging/rt2870/Makefile b/drivers/staging/rt2870/Makefile
index 306c331..523e7e7 100644 (file)
--- a/drivers/staging/rt2870/Makefile
+++ b/drivers/staging/rt2870/Makefile
@@ -1,27 +1,35 @@
+#
 obj-$(CONFIG_RT2870)   += rt2870sta.o
 
 # TODO: all of these should be removed
 EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT
-EXTRA_CFLAGS += -DRT2870 -DRT3070
+EXTRA_CFLAGS += -DRTMP_MAC_USB -DRTMP_USB_SUPPORT -DRT2870 -DRTMP_TIMER_TASK_SUPPORT
+EXTRA_CFLAGS += -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DRT30xx -DRT3070
 EXTRA_CFLAGS += -DDBG
 
 rt2870sta-objs :=              \
-       common/md5.o            \
+       common/crypt_md5.o      \
+       common/crypt_sha2.o     \
+       common/crypt_hmac.o     \
        common/mlme.o           \
-       common/rtmp_wep.o       \
+       common/cmm_wep.o        \
        common/action.o         \
        common/cmm_data.o       \
        common/rtmp_init.o      \
-       common/rtmp_tkip.o      \
+       common/cmm_tkip.o       \
+       common/cmm_aes.o        \
        common/cmm_sync.o       \
        common/eeprom.o         \
        common/cmm_sanity.o     \
        common/cmm_info.o       \
+       common/cmm_cfg.o        \
        common/cmm_wpa.o        \
        common/dfs.o            \
        common/spectrum.o       \
+       common/rtmp_timer.o     \
+       common/rt_channel.o     \
+       common/cmm_asic.o       \
        sta/assoc.o             \
-       sta/aironet.o           \
        sta/auth.o              \
        sta/auth_rsp.o          \
        sta/sync.o              \
@@ -30,14 +38,18 @@ rt2870sta-objs :=           \
        sta/connect.o           \
        sta/wpa.o               \
        rt_linux.o              \
-       rt_profile.o            \
        rt_main_dev.o           \
        sta_ioctl.o             \
        common/ba_action.o      \
-       2870_main_dev.o         \
-       common/2870_rtmp_init.o \
+       usb_main_dev.o          \
+       rt_usb.o                \
+       common/cmm_mac_usb.o    \
        common/rtusb_io.o       \
        common/rtusb_bulk.o     \
        common/rtusb_data.o     \
-       common/cmm_data_2870.o
-
+       common/cmm_data_usb.o   \
+       common/rtmp_mcu.o       \
+       common/ee_efuse.o       \
+       chips/rt30xx.o          \
+       common/rt_rf.o          \
+       chips/rt3070.o