summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2011-07-15 03:06:21 (GMT)
committerLarry Finger <Larry.Finger@lwfinger.net>2011-08-24 02:33:27 (GMT)
commitc9d9a8016daab38681b498b094e6cac876a12fc4 (patch)
tree33853e3005de67c1a28a69ba01c9bed809a4b2f0
parentd22a33646965656d800e4c7afa8c1b54a4ba63fe (diff)
downloadlinux-c9d9a8016daab38681b498b094e6cac876a12fc4.tar.xz
staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
-rw-r--r--drivers/staging/rtl8192e/Makefile1
-rw-r--r--drivers/staging/rtl8192e/rtl_core.h6
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/Makefile b/drivers/staging/rtl8192e/Makefile
index a56900f..fb00749 100644
--- a/drivers/staging/rtl8192e/Makefile
+++ b/drivers/staging/rtl8192e/Makefile
@@ -1,4 +1,3 @@
-ccflags-y += -DEEPROM_OLD_FORMAT_SUPPORT=1
ccflags-y += -DUSE_FW_SOURCE_IMG_FILE
ccflags-y += -DCONFIG_PM_RTL
ccflags-y += -DCONFIG_PM
diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl_core.h
index ae858eb..a853bee 100644
--- a/drivers/staging/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl_core.h
@@ -786,15 +786,9 @@ typedef struct r8192_priv
u8 EEPROMPwrGroup[2][3];
u8 EEPROMOptional;
-#if (EEPROM_OLD_FORMAT_SUPPORT == 1)
u8 EEPROMTxPowerLevelCCK[14];
u8 EEPROMTxPowerLevelOFDM24G[14];
u8 EEPROMTxPowerLevelOFDM5G[24];
-#else
- u8 RfCckChnlAreaTxPwr[2][3];
- u8 RfOfdmChnlAreaTxPwr1T[2][3];
- u8 RfOfdmChnlAreaTxPwr2T[2][3];
-#endif
u8 EEPROMRfACCKChnl1TxPwLevel[3];
u8 EEPROMRfAOfdmChnlTxPwLevel[3];
u8 EEPROMRfCCCKChnl1TxPwLevel[3];