[kernel] r16772 - dists/sid/linux-2.6/debian/patches/features/all

[Ben Hutchings]

Author: benh
Date: Wed Jan  5 02:20:06 2011
New Revision: 16772

Log:
Sync with committed version of r8169 firmware loading change

Modified:
   dists/sid/linux-2.6/debian/patches/features/all/r8169-remove-the-firmware-of-RTL8111D.patch

Modified: dists/sid/linux-2.6/debian/patches/features/all/r8169-remove-the-firmware-of-RTL8111D.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/r8169-remove-the-firmware-of-RTL8111D.patch	Wed Jan  5 02:12:54 2011	(r16771)
+++ dists/sid/linux-2.6/debian/patches/features/all/r8169-remove-the-firmware-of-RTL8111D.patch	Wed Jan  5 02:20:06 2011	(r16772)
@@ -2,6 +2,8 @@
 Date: Mon, 3 Jan 2011 00:35:52 +0100
 Subject: [PATCH] r8169: remove the firmware of RTL8111D.
 
+commit bca03d5f32c8ee9b5cfa1d32640a63fded6cb3c0 upstream.
+
 The binary file of the firmware is moved to linux-firmware repository.
 The firmwares are rtl_nic/rtl8168d-1.fw and rtl_nic/rtl8168d-2.fw.
 The driver goes along if the firmware couldn't be found. However, it
@@ -16,9 +18,16 @@
 Cc: Ben Hutchings <benh at debian.org>
 [bwh: Adjust for Debian's 2.6.32]
 ---
- drivers/net/r8169.c |  157 ++++++++++++++++++++++++++++++++++++++++++++-------
- 1 files changed, 137 insertions(+), 20 deletions(-)
-
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2233,6 +2233,7 @@ config YELLOWFIN
+ config R8169
+ 	tristate "Realtek 8169 gigabit ethernet support"
+ 	depends on PCI
++	select FW_LOADER
+ 	select CRC32
+ 	select MII
+ 	---help---
 diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
 index a31745b..a9b9e2a 100644
 --- a/drivers/net/r8169.c
@@ -290,6 +299,3 @@
  		break;
  	case RTL_GIGA_MAC_VER_27:
  		rtl8168d_3_hw_phy_config(ioaddr);
--- 
-1.7.2.3
-