From: Charles Clément <caratorn@gmail.com>
Date: Tue, 1 Jun 2010 19:38:54 +0000 (-0700)
Subject: Staging: vt6655: removed custom CHAR typedef
X-Git-Tag: v2.6.36-rc1~520^2~1^2~470
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5a4197bdda7914558fdc24f63d4ed6c64c5e54b3;p=~emulex%2Finfiniband.git

Staging: vt6655: removed custom CHAR typedef

Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/vt6655/country.h b/drivers/staging/vt6655/country.h
index 2005d276868..3206feec8b3 100644
--- a/drivers/staging/vt6655/country.h
+++ b/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/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 0766a917237..4ea94a7d5ff 100644
--- a/drivers/staging/vt6655/device.h
+++ b/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/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h
index 4974703bab9..1be30d8108a 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 char            CHAR;
 typedef signed short    SHORT;
 typedef signed int      INT;
 typedef signed long     LONG;