diff --git a/[refs] b/[refs] index e62cf5de3b85..9858a677f527 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16fb15baea85302af9215b8558103aa27e008d36 +refs/heads/master: 642ec04b78f77e44a2a3c88ddb4fe6ffe57d9c33 diff --git a/trunk/drivers/staging/rtl8192su/Makefile b/trunk/drivers/staging/rtl8192su/Makefile index 58073da4855d..8c1cd54ccaf0 100644 --- a/trunk/drivers/staging/rtl8192su/Makefile +++ b/trunk/drivers/staging/rtl8192su/Makefile @@ -12,8 +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_USB_PHY_TEST=0 - #EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT r8192s_usb-objs := \ diff --git a/trunk/drivers/staging/rtl8192su/r8192U_core.c b/trunk/drivers/staging/rtl8192su/r8192U_core.c index 55aeaf6ce2da..48e161072b7e 100644 --- a/trunk/drivers/staging/rtl8192su/r8192U_core.c +++ b/trunk/drivers/staging/rtl8192su/r8192U_core.c @@ -6683,23 +6683,6 @@ static void rtl8192SU_MacConfigAfterFwDownload(struct net_device *dev) tmpU1b = read_nic_byte_E(dev, 0x5C); write_nic_byte_E(dev, 0x5C, tmpU1b|BIT7); - // - // Revise USB PHY to solve the issue of Rx payload error, Rivesed by Roger, 2008-04-10 - // Suggest by SD1 Alex. - // - // The following operation are ONLY for USB PHY test chip. - // 2008.10.07. - // -#if RTL8192SU_USB_PHY_TEST - write_nic_byte(dev, 0x41,0xf4); - write_nic_byte(dev, 0x40,0x00); - write_nic_byte(dev, 0x42,0x00); - write_nic_byte(dev, 0x42,0x01); - write_nic_byte(dev, 0x40,0x0f); - write_nic_byte(dev, 0x42,0x00); - write_nic_byte(dev, 0x42,0x01); -#endif - #if 0 //LZM 090219 // // Suggested by SD1 Alex, 2008-06-14.