diff --git a/[refs] b/[refs] index c56e63c35bee..382feed206f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 385b330228b1f10877a66b87ab9164275f33d350 +refs/heads/master: 3a63e8287d8d8a6e0150b27deaf7ba97110dc274 diff --git a/trunk/drivers/staging/rtl8192su/Makefile b/trunk/drivers/staging/rtl8192su/Makefile index 3880461bea8e..abdf53d9abad 100644 --- a/trunk/drivers/staging/rtl8192su/Makefile +++ b/trunk/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/trunk/drivers/staging/rtl8192su/r8192U_core.c b/trunk/drivers/staging/rtl8192su/r8192U_core.c index 21d9d76bbeba..5c643d70c526 100644 --- a/trunk/drivers/staging/rtl8192su/r8192U_core.c +++ b/trunk/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)