diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-07 17:50:51 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-07 17:50:51 +1000 |
commit | eec1ba76a0f043bdea21db10df4287bb5a4d25a8 (patch) | |
tree | 269e10ce578105322820dd426e30cf9eea7513c6 /drivers/staging/otus/wrap_sec.c | |
parent | 9fdbbf93bb3bb2b62335e780bb94871fc39dc5d8 (diff) | |
parent | bb104a76ac0e6c103c36623616c7dee8cd9d165c (diff) |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
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); |