From c9d9a8016daab38681b498b094e6cac876a12fc4 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 14 Jul 2011 22:06:21 -0500 Subject: [PATCH] staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/Makefile | 1 - drivers/staging/rtl8192e/rtl_core.h | 6 ------ 2 files changed, 7 deletions(-) diff --git a/drivers/staging/rtl8192e/Makefile b/drivers/staging/rtl8192e/Makefile index a56900f8341e..fb007491c5fa 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 ae858eb253b4..a853bee6b2d3 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]; -- 2.20.1