diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 4ea94a7d5ff5a40066dcfe708343a0b52666edfe..5f4efb5904dbc7d0544d3eb4e688deaad2a6b6fd 100644
--- a/drivers/staging/vt6655/device.h
+++ b/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/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h
index 1be30d8108a745e573b1612eed7f0bf5bf004a91..52f1a0c2adc79e6d14a22443fbd3065331c2fb6a 100644
--- a/drivers/staging/vt6655/ttype.h
+++ b/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;