From: Larry Finger Date: Fri, 15 Jul 2011 03:06:21 +0000 (-0500) Subject: staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c9d9a8016daab38681b498b094e6cac876a12fc4;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT Signed-off-by: Larry Finger --- 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];