diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/otus/wrap_mis.c | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/otus/wrap_mis.c')
-rw-r--r-- | drivers/staging/otus/wrap_mis.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/otus/wrap_mis.c b/drivers/staging/otus/wrap_mis.c index 337918b..ea2199f 100644 --- a/drivers/staging/otus/wrap_mis.c +++ b/drivers/staging/otus/wrap_mis.c @@ -28,10 +28,7 @@ #include "usbdrv.h" #include <linux/netlink.h> - -#if WIRELESS_EXT > 12 #include <net/iw_handler.h> -#endif //extern struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER]; extern struct zsVapStruct vap[ZM_VAP_PORT_NUMBER]; |