diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-09-19 11:27:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-19 11:28:41 +0200 |
| commit | 929bf0d0156562ce631728b6fa53d68004d456d2 (patch) | |
| tree | 739063990a8077b29ef97e69d73bce94573daae4 /drivers/staging/otus/wrap_sec.c | |
| parent | sched_clock: Make it NMI safe (diff) | |
| parent | pty_write: don't do a tty_wakeup() when the buffers are full (diff) | |
| download | linux-dev-929bf0d0156562ce631728b6fa53d68004d456d2.tar.xz linux-dev-929bf0d0156562ce631728b6fa53d68004d456d2.zip | |
Merge branch 'linus' into perfcounters/core
Merge reason: Bring in tracing changes we depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/staging/otus/wrap_sec.c')
| -rw-r--r-- | drivers/staging/otus/wrap_sec.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/otus/wrap_sec.c b/drivers/staging/otus/wrap_sec.c index f688d064175d..0f780bacc598 100644 --- a/drivers/staging/otus/wrap_sec.c +++ b/drivers/staging/otus/wrap_sec.c @@ -28,10 +28,7 @@ #include "usbdrv.h" #include <linux/netlink.h> - -#if WIRELESS_EXT > 12 #include <net/iw_handler.h> -#endif #ifdef ZM_ENABLE_CENC extern int zfLnxCencSendMsg(struct sock *netlink_sk, u_int8_t *msg, int len); |