diff options
author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
---|---|---|
committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/staging/rt3090/Makefile | |
parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
parent | perf tools: Move dereference after NULL test (diff) | |
download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'drivers/staging/rt3090/Makefile')
-rw-r--r-- | drivers/staging/rt3090/Makefile | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/drivers/staging/rt3090/Makefile b/drivers/staging/rt3090/Makefile new file mode 100644 index 000000000000..995491c91fce --- /dev/null +++ b/drivers/staging/rt3090/Makefile @@ -0,0 +1,80 @@ +obj-$(CONFIG_RT3090) += rt3090sta.o + +include drivers/staging/rt3090/config.mk + +rt3090sta-objs := \ + common/crypt_md5.o \ + common/crypt_sha2.o \ + common/crypt_hmac.o \ + common/mlme.o \ + common/cmm_wep.o \ + common/action.o \ + common/cmm_data.o \ + common/rtmp_init.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_profile.o \ + common/cmm_asic.o \ + sta/assoc.o \ + sta/auth.o \ + sta/auth_rsp.o \ + sta/sync.o \ + sta/sanity.o \ + sta/rtmp_data.o \ + sta/connect.o \ + sta/wpa.o \ + rt_linux.o \ + rt_profile.o \ + rt_main_dev.o \ + sta_ioctl.o + +#ifdef DOT11_N_SUPPORT +ifeq ($(HAS_DOT11_N_SUPPORT),y) +rt3090sta-objs += \ + common/ba_action.o +endif +#endif // DOT11_N_SUPPORT // + +#ifdef ETH_CONVERT +ifeq ($(HAS_ETH_CONVERT_SUPPORT), y) +rt3090sta-objs += \ + common/cmm_mat.o \ + common/cmm_mat_iparp.o \ + common/cmm_mat_pppoe.o \ + common/cmm_mat_ipv6.o +endif +#endif // ETH_CONVERT // + +ifeq ($(HAS_BLOCK_NET_IF),y) +rt3090sta-objs += common/netif_block.o +endif + +ifeq ($(HAS_QOS_DLS_SUPPORT),y) +rt3090sta-objs += sta/dls.o +endif + +rt3090sta-objs += \ + pci_main_dev.o \ + rt_pci_rbus.o \ + common/cmm_mac_pci.o \ + common/cmm_data_pci.o \ + common/ee_prom.o \ + common/ee_efuse.o \ + common/rtmp_mcu.o \ + chips/rt30xx.o \ + common/rt_rf.o \ + chips/rt3090.o + +ifeq ($(HAS_ATE),y) +rt3090sta-objs += rt_ate.o +endif |