diff --git a/[refs] b/[refs]
index 86f9096610cb..2def41f36f89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a4197bdda7914558fdc24f63d4ed6c64c5e54b3
+refs/heads/master: 0c93a98a0e9073e0ffa7aea1e515a5e146e798a7
diff --git a/trunk/drivers/staging/vt6655/device.h b/trunk/drivers/staging/vt6655/device.h
index 4ea94a7d5ff5..5f4efb5904db 100644
--- a/trunk/drivers/staging/vt6655/device.h
+++ b/trunk/drivers/staging/vt6655/device.h
@@ -681,11 +681,11 @@ typedef struct __device_info {
     // For Auto Power Tunning
 
     BYTE                    byAutoPwrTunning;
-    SHORT                   sPSetPointCCK;
-    SHORT                   sPSetPointOFDMG;
-    SHORT                   sPSetPointOFDMA;
+    short                   sPSetPointCCK;
+    short                   sPSetPointOFDMG;
+    short                   sPSetPointOFDMA;
     LONG                    lPFormulaOffset;
-    SHORT                   sPThreshold;
+    short                   sPThreshold;
     char                    cAdjustStep;
     char                    cMinTxAGC;
 
diff --git a/trunk/drivers/staging/vt6655/ttype.h b/trunk/drivers/staging/vt6655/ttype.h
index 1be30d8108a7..52f1a0c2adc7 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 signed short    SHORT;
 typedef signed int      INT;
 typedef signed long     LONG;