From: Bartlomiej Zolnierkiewicz Date: Fri, 3 Jul 2009 14:07:14 +0000 (+0200) Subject: Staging: rtl8192su: remove RTL8192SU_USE_PARAM_TXPWR ifdefs X-Git-Tag: v2.6.32-rc1~668^2~540 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3a63e8287d8d8a6e0150b27deaf7ba97110dc274;p=~emulex%2Finfiniband.git Staging: rtl8192su: remove RTL8192SU_USE_PARAM_TXPWR ifdefs Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192su/Makefile b/drivers/staging/rtl8192su/Makefile index 3880461bea8..abdf53d9aba 100644 --- a/drivers/staging/rtl8192su/Makefile +++ b/drivers/staging/rtl8192su/Makefile @@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -EXTRA_CFLAGS += -DRTL8192SU_USE_PARAM_TXPWR=0 EXTRA_CFLAGS += -DRTL8192SU_FPGA_UNSPECIFIED_NETWORK=0 #EXTRA_CFLAGS += -DRTL8192SU_FPGA_2MAC_VERIFICATION #=0 EXTRA_CFLAGS += -DRTL8192SU_ASIC_VERIFICATION diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c index 21d9d76bbeb..5c643d70c52 100644 --- a/drivers/staging/rtl8192su/r8192U_core.c +++ b/drivers/staging/rtl8192su/r8192U_core.c @@ -5513,12 +5513,7 @@ rtl8192SU_ReadAdapterInfo8192SUsb(struct net_device* dev) else { priv->AutoloadFailFlag=FALSE; -#if RTL8192SU_USE_PARAM_TXPWR - priv->bTXPowerDataReadFromEEPORM = FALSE; -#else priv->bTXPowerDataReadFromEEPORM = TRUE; -#endif - } // Read IC Version && Channel Plan if(!priv->AutoloadFailFlag)