diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-07 17:50:51 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-07 17:50:51 +1000 |
commit | eec1ba76a0f043bdea21db10df4287bb5a4d25a8 (patch) | |
tree | 269e10ce578105322820dd426e30cf9eea7513c6 /drivers/staging/rtl8192su/Makefile | |
parent | 9fdbbf93bb3bb2b62335e780bb94871fc39dc5d8 (diff) | |
parent | bb104a76ac0e6c103c36623616c7dee8cd9d165c (diff) |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/rtl8192su/Makefile')
-rw-r--r-- | drivers/staging/rtl8192su/Makefile | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/drivers/staging/rtl8192su/Makefile b/drivers/staging/rtl8192su/Makefile index f010ab502a97..52dc09baf4f8 100644 --- a/drivers/staging/rtl8192su/Makefile +++ b/drivers/staging/rtl8192su/Makefile @@ -5,30 +5,9 @@ EXTRA_CFLAGS += -O2 EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y EXTRA_CFLAGS += -DJACKSON_NEW_RX -EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TURBO -#EXTRA_CFLAGS += -DUSE_ONE_PIPE -EXTRA_CFLAGS += -DENABLE_DOT11D - -EXTRA_CFLAGS += -DRTL8192SU -EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 -EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE -EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 - -#EXTRA_CFLAGS += -DEEPROM_OLD_FORMAT_SUPPORT - -#EXTRA_CFLAGS += -DUSB_RX_AGGREGATION_SUPPORT=0 -#EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE=0 -#EXTRA_CFLAGS += -DRTL8192SU_DISABLE_CCK_RATE=0 -EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0 -EXTRA_CFLAGS += -DDISABLE_BB_RF=0 -EXTRA_CFLAGS += -DRTL8192SU_USE_PARAM_TXPWR=0 -EXTRA_CFLAGS += -DRTL8192SU_FPGA_UNSPECIFIED_NETWORK=0 -#EXTRA_CFLAGS += -DRTL8192SU_FPGA_2MAC_VERIFICATION #=0 -EXTRA_CFLAGS += -DRTL8192SU_ASIC_VERIFICATION -EXTRA_CFLAGS += -DRTL8192SU_USB_PHY_TEST=0 +EXTRA_CFLAGS += -DTHOMAS_BEACON #EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT -EXTRA_CFLAGS += -DCONFIG_RTL8192_PM r8192s_usb-objs := \ r8180_93cx6.o \ @@ -42,9 +21,11 @@ r8192s_usb-objs := \ r8192S_firmware.o \ r8192S_Efuse.o \ r8192U_core.o \ - r8192U_pm.o - -ieee80211-rsl-objs := \ + r8192U_pm.o \ + ieee80211/ieee80211_crypt.o \ + ieee80211/ieee80211_crypt_tkip.o \ + ieee80211/ieee80211_crypt_ccmp.o \ + ieee80211/ieee80211_crypt_wep.o \ ieee80211/ieee80211_rx.o \ ieee80211/ieee80211_softmac.o \ ieee80211/ieee80211_tx.o \ @@ -57,10 +38,3 @@ ieee80211-rsl-objs := \ ieee80211/dot11d.o obj-$(CONFIG_RTL8192SU) += r8192s_usb.o -obj-$(CONFIG_RTL8192SU) += ieee80211-rsl.o -obj-$(CONFIG_RTL8192SU) += ieee80211/ieee80211_crypt.o -obj-$(CONFIG_RTL8192SU) += ieee80211/ieee80211_crypt_tkip.o -obj-$(CONFIG_RTL8192SU) += ieee80211/ieee80211_crypt_ccmp.o -obj-$(CONFIG_RTL8192SU) += ieee80211/ieee80211_crypt_wep.o - - |