diff options
| author | Malcolm Priestley | 2012-11-24 15:19:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-11-27 01:23:42 +0100 |
| commit | 11d404cb56ecd53bb23499897fbe7be1a9ac4827 (patch) | |
| tree | 787ab8710cbe4e6e385fa66649f809260d586937 /drivers/staging/vt6656 | |
| parent | staging: ced1401: Fix typo in staging/ced1401 (diff) | |
| download | kernel-qcow2-linux-11d404cb56ecd53bb23499897fbe7be1a9ac4827.tar.gz kernel-qcow2-linux-11d404cb56ecd53bb23499897fbe7be1a9ac4827.tar.xz kernel-qcow2-linux-11d404cb56ecd53bb23499897fbe7be1a9ac4827.zip | |
staging: vt6656: fix headers and add cfg80211.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656')
| -rw-r--r-- | drivers/staging/vt6656/80211mgr.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/device.h | 39 | ||||
| -rw-r--r-- | drivers/staging/vt6656/key.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/wpa2.c | 2 |
4 files changed, 15 insertions, 30 deletions
diff --git a/drivers/staging/vt6656/80211mgr.c b/drivers/staging/vt6656/80211mgr.c index 39f98423dc02..e6ced95e6fa7 100644 --- a/drivers/staging/vt6656/80211mgr.c +++ b/drivers/staging/vt6656/80211mgr.c @@ -52,11 +52,11 @@ * */ +#include "device.h" #include "tmacro.h" #include "tether.h" #include "80211mgr.h" #include "80211hdr.h" -#include "device.h" #include "wpa.h" /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 2595ac51b203..9a0490077da7 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -30,43 +30,28 @@ #define __DEVICE_H__ #include <linux/module.h> -#include <linux/types.h> -#include <linux/init.h> -#include <linux/mm.h> -#include <linux/errno.h> -#include <linux/ioport.h> -#include <linux/pci.h> #include <linux/kernel.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/skbuff.h> -#include <linux/delay.h> -#include <linux/timer.h> #include <linux/slab.h> -#include <linux/interrupt.h> -#include <linux/string.h> -#include <linux/wait.h> +#include <linux/init.h> +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/firmware.h> +#include <linux/etherdevice.h> +#include <linux/suspend.h> #include <linux/if_arp.h> -#include <linux/sched.h> -#include <linux/if.h> -#include <linux/rtnetlink.h>//James -#include <linux/proc_fs.h> -#include <linux/inetdevice.h> -#include <linux/reboot.h> +#include <linux/wireless.h> +#include <net/iw_handler.h> +#include <net/cfg80211.h> +#include <linux/timer.h> #include <linux/usb.h> -#include <linux/signal.h> -#include <linux/firmware.h> -#include <asm/io.h> -#include <asm/uaccess.h> + + #ifdef SIOCETHTOOL #define DEVICE_ETHTOOL_IOCTL_SUPPORT #include <linux/ethtool.h> #else #undef DEVICE_ETHTOOL_IOCTL_SUPPORT #endif -/* Include Wireless Extension definition and check version - Jean II */ -#include <linux/wireless.h> -#include <net/iw_handler.h> // New driver API //please copy below macro to driver_event.c for API #define RT_INSMOD_EVENT_FLAG 0x0101 diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c index bf24adb7f29c..8c78b86b5c80 100644 --- a/drivers/staging/vt6656/key.c +++ b/drivers/staging/vt6656/key.c @@ -36,9 +36,9 @@ * */ +#include "mac.h" #include "tmacro.h" #include "key.h" -#include "mac.h" #include "rndis.h" #include "control.h" diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.c index c0926976627d..616e24dcf42b 100644 --- a/drivers/staging/vt6656/wpa2.c +++ b/drivers/staging/vt6656/wpa2.c @@ -31,8 +31,8 @@ * */ -#include "wpa2.h" #include "device.h" +#include "wpa2.h" /*--------------------- Static Definitions -------------------------*/ static int msglevel =MSG_LEVEL_INFO; |