From f19be413c48239d5e7d0a10f55b9a25ce5fb8bb9 Mon Sep 17 00:00:00 2001
From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Sat, 24 Nov 2012 14:19:34 +0000
Subject: [PATCH] --- yaml --- r: 338253 b: refs/heads/master c:
 11d404cb56ecd53bb23499897fbe7be1a9ac4827 h: refs/heads/master i:   338251:
 fabb9f3edf287646b0906525739a1b6149c096e2 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/vt6656/80211mgr.c |  2 +-
 trunk/drivers/staging/vt6656/device.h   | 39 ++++++++-----------------
 trunk/drivers/staging/vt6656/key.c      |  2 +-
 trunk/drivers/staging/vt6656/wpa2.c     |  2 +-
 5 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/[refs] b/[refs]
index d7a869ee770b..0e9a14e0ef1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1a21ee9deb2492cbff38943dd6fa502161319a6
+refs/heads/master: 11d404cb56ecd53bb23499897fbe7be1a9ac4827
diff --git a/trunk/drivers/staging/vt6656/80211mgr.c b/trunk/drivers/staging/vt6656/80211mgr.c
index 39f98423dc02..e6ced95e6fa7 100644
--- a/trunk/drivers/staging/vt6656/80211mgr.c
+++ b/trunk/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/trunk/drivers/staging/vt6656/device.h b/trunk/drivers/staging/vt6656/device.h
index 2595ac51b203..9a0490077da7 100644
--- a/trunk/drivers/staging/vt6656/device.h
+++ b/trunk/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/trunk/drivers/staging/vt6656/key.c b/trunk/drivers/staging/vt6656/key.c
index bf24adb7f29c..8c78b86b5c80 100644
--- a/trunk/drivers/staging/vt6656/key.c
+++ b/trunk/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/trunk/drivers/staging/vt6656/wpa2.c b/trunk/drivers/staging/vt6656/wpa2.c
index c0926976627d..616e24dcf42b 100644
--- a/trunk/drivers/staging/vt6656/wpa2.c
+++ b/trunk/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;