diff --git a/[refs] b/[refs]
index 4f89fc25cbe1..86f9096610cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 902d2411298a6e0b8a473a0163aa4bf6d5c8a073
+refs/heads/master: 5a4197bdda7914558fdc24f63d4ed6c64c5e54b3
diff --git a/trunk/drivers/staging/vt6655/country.h b/trunk/drivers/staging/vt6655/country.h
index 2005d2768680..3206feec8b34 100644
--- a/trunk/drivers/staging/vt6655/country.h
+++ b/trunk/drivers/staging/vt6655/country.h
@@ -162,7 +162,7 @@ typedef enum _COUNTRY_CODE {
 typedef struct tagSCountryTable
 {
     BYTE    byChannelCountryCode;             /* The country code         */
-    CHAR    chCountryCode[2];
+    char    chCountryCode[2];
     BYTE    bChannelIdxList[CB_MAX_CHANNEL];  /* Available channels Index */
     BYTE    byPower[CB_MAX_CHANNEL];
 }   SCountryTable, *PSCountryTable;
diff --git a/trunk/drivers/staging/vt6655/device.h b/trunk/drivers/staging/vt6655/device.h
index 0766a917237a..4ea94a7d5ff5 100644
--- a/trunk/drivers/staging/vt6655/device.h
+++ b/trunk/drivers/staging/vt6655/device.h
@@ -686,8 +686,8 @@ typedef struct __device_info {
     SHORT                   sPSetPointOFDMA;
     LONG                    lPFormulaOffset;
     SHORT                   sPThreshold;
-    CHAR                    cAdjustStep;
-    CHAR                    cMinTxAGC;
+    char                    cAdjustStep;
+    char                    cMinTxAGC;
 
     // For RF Power table
     BYTE                    byCCKPwr;
diff --git a/trunk/drivers/staging/vt6655/ttype.h b/trunk/drivers/staging/vt6655/ttype.h
index 4974703bab9d..1be30d8108a7 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 char            CHAR;
 typedef signed short    SHORT;
 typedef signed int      INT;
 typedef signed long     LONG;