staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

diff --git a/drivers/staging/rtl8192e/Makefile b/drivers/staging/rtl8192e/Makefile
index a56900f8341e129f7d64cd92161ed881cd1a779b..fb007491c5fa3221a1ec2fd606ecca2128b8d136 100644 (file)
--- 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 ae858eb253b4208139adc0c1d72db76fd2c86465..a853bee6b2d352183a67c0bcd0834dc23f8c54a5 100644 (file)
--- 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];