From 7aa563b5c2be4b52a12dab6f085b0234d9c00a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles=20Cl=C3=A9ment?= <caratorn@gmail.com>
Date: Wed, 2 Jun 2010 09:52:00 -0700
Subject: [PATCH] --- yaml --- r: 205591 b: refs/heads/master c:
 800acdbdf83efe6a2b4dbe61e3ab676b5c99d153 h: refs/heads/master i:   205589:
 1911ec85dc6fbbe7e4dc42f22a82ba079680de0d   205587:
 72aba7926c409c5018f5d9167063960fd8083c21   205583:
 8aae31f36d8fcbe9a917c86fd6d1fced0f722b01 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/staging/vt6655/ttype.h |  1 -
 trunk/drivers/staging/vt6655/wmgr.h  | 14 +++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 8817d4503760..694bc0f6601f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c9824e124f67c2590e1dbd33045603c36168609
+refs/heads/master: 800acdbdf83efe6a2b4dbe61e3ab676b5c99d153
diff --git a/trunk/drivers/staging/vt6655/ttype.h b/trunk/drivers/staging/vt6655/ttype.h
index 74ec69f822fe..eaf77d5348e4 100644
--- a/trunk/drivers/staging/vt6655/ttype.h
+++ b/trunk/drivers/staging/vt6655/ttype.h
@@ -68,7 +68,6 @@ typedef int             BOOL;
  * but it doesn't matter if they're signed or unsigned.
  */
 
-typedef unsigned short  USHORT;
 typedef unsigned int    UINT;
 typedef unsigned long   ULONG;
 typedef unsigned long long	ULONGLONG; //64 bit
diff --git a/trunk/drivers/staging/vt6655/wmgr.h b/trunk/drivers/staging/vt6655/wmgr.h
index d53aed7ad526..9367f478dbf6 100644
--- a/trunk/drivers/staging/vt6655/wmgr.h
+++ b/trunk/drivers/staging/vt6655/wmgr.h
@@ -91,26 +91,26 @@ typedef void (*TimerFunction)(ULONG);
 typedef unsigned char NDIS_802_11_MAC_ADDRESS[6];
 typedef struct _NDIS_802_11_AI_REQFI
 {
-    USHORT Capabilities;
-    USHORT ListenInterval;
+    unsigned short Capabilities;
+    unsigned short ListenInterval;
     NDIS_802_11_MAC_ADDRESS  CurrentAPAddress;
 } NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI;
 
 typedef struct _NDIS_802_11_AI_RESFI
 {
-    USHORT Capabilities;
-    USHORT StatusCode;
-    USHORT AssociationId;
+    unsigned short Capabilities;
+    unsigned short StatusCode;
+    unsigned short AssociationId;
 } NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;
 
 typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION
 {
     ULONG                   Length;
-    USHORT                  AvailableRequestFixedIEs;
+    unsigned short          AvailableRequestFixedIEs;
     NDIS_802_11_AI_REQFI    RequestFixedIEs;
     ULONG                   RequestIELength;
     ULONG                   OffsetRequestIEs;
-    USHORT                  AvailableResponseFixedIEs;
+    unsigned short          AvailableResponseFixedIEs;
     NDIS_802_11_AI_RESFI    ResponseFixedIEs;
     ULONG                   ResponseIELength;
     ULONG                   OffsetResponseIEs;