diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 17:32:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 17:32:04 +1000 |
| commit | 1a4072a95e8f79c2e52aed795e0e54428b0f31fc (patch) | |
| tree | 6e7aa0663141156aa8fd57c8120a0aa76daf8d66 /drivers/staging/otus/wrap_sec.c | |
| parent | 111a3b94375ee87535ac985de4c94be5e5634881 (diff) | |
| parent | c0e03fabb4f2a6e48f6e0b55729b26a599a2bd02 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/at76_usb/at76_usb.c
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); |