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/otus/wrap_mem.c | |
| 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/otus/wrap_mem.c')
| -rw-r--r-- | drivers/staging/otus/wrap_mem.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/otus/wrap_mem.c b/drivers/staging/otus/wrap_mem.c index 8081bb2f8878..32416d77a471 100644 --- a/drivers/staging/otus/wrap_mem.c +++ b/drivers/staging/otus/wrap_mem.c @@ -27,10 +27,7 @@ #include "usbdrv.h" #include <linux/netlink.h> - -#if WIRELESS_EXT > 12 #include <net/iw_handler.h> -#endif /* Memory management */ /* Called to allocate uncached memory, allocated memory must */ |