[PATCH 29/30] staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT
Larry Finger
Larry.Finger at lwfinger.net
Fri Jul 15 16:01:54 UTC 2011
Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
---
drivers/staging/rtl8192e/Makefile | 1 -
drivers/staging/rtl8192e/rtl_core.h | 6 ------
2 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8192e/Makefile b/drivers/staging/rtl8192e/Makefile
index 5300076..79adfa7 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 8318a09..89242a6 100644
--- a/drivers/staging/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl_core.h
@@ -785,15 +785,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];
--
1.7.3.4
More information about the devel
mailing list