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/rt3070/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/rt3070/Makefile')
| -rw-r--r-- | drivers/staging/rt3070/Makefile | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/drivers/staging/rt3070/Makefile b/drivers/staging/rt3070/Makefile deleted file mode 100644 index df7ac19e0883..000000000000 --- a/drivers/staging/rt3070/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -obj-$(CONFIG_RT3070) += rt3070sta.o - -# TODO: all of these should be removed -EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT -EXTRA_CFLAGS += -DRT2870 -DRT30xx -DRT3070 -EXTRA_CFLAGS += -DDBG - -rt3070sta-objs := \ - common/md5.o \ - common/mlme.o \ - common/rtmp_wep.o \ - common/action.o \ - common/cmm_data.o \ - common/rtmp_init.o \ - common/rtmp_tkip.o \ - common/cmm_sync.o \ - common/eeprom.o \ - common/cmm_sanity.o \ - common/cmm_info.o \ - common/cmm_wpa.o \ - common/dfs.o \ - common/spectrum.o \ - sta/assoc.o \ - sta/aironet.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 \ - common/ba_action.o \ - 2870_main_dev.o \ - common/2870_rtmp_init.o \ - common/rtusb_io.o \ - common/rtusb_bulk.o \ - common/rtusb_data.o \ - common/cmm_data_2870.o - |