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/vt6655/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/vt6655/Makefile')
| -rw-r--r-- | drivers/staging/vt6655/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/vt6655/Makefile b/drivers/staging/vt6655/Makefile index 7d76e7ef3f88..931deb109ee8 100644 --- a/drivers/staging/vt6655/Makefile +++ b/drivers/staging/vt6655/Makefile @@ -1,8 +1,8 @@ # TODO: all of these should be removed -EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -D__NO_VERSION__ +EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -D__NO_VERSION__ EXTRA_CFLAGS += -DHOSTAP -vt6655-y += device_main.o \ +vt6655_stage-y += device_main.o \ card.o \ mac.o \ baseband.o \ @@ -35,4 +35,4 @@ vt6655-y += device_main.o \ vntwifi.o \ IEEE11h.o -obj-$(CONFIG_VT6655) += vt6655.o +obj-$(CONFIG_VT6655) += vt6655_stage.o |