[kernel] r16261 - in dists/sid/linux-2.6/debian: . patches/features/all patches/series

[Ben Hutchings]

Author: benh
Date: Fri Sep 10 01:08:49 2010
New Revision: 16261

Log:
r8169: Remove MODULE_FIRMWARE declarations

The firmware is non-essential and we do not distribute it

Added:
   dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-3.patch
      - copied, changed from r16257, dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/22

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri Sep 10 00:55:00 2010	(r16260)
+++ dists/sid/linux-2.6/debian/changelog	Fri Sep 10 01:08:49 2010	(r16261)
@@ -48,6 +48,8 @@
     (Closes: #594845)
   * [x86] Add brcm80211 driver for Broadcom 802.11n wireless network
     controllers
+  * r8169: Remove MODULE_FIRMWARE declarations since the firmware is
+    non-essential and we do not distribute it
 
   [ Bastian Blank ]
   * Use Breaks instead of Conflicts.

Copied and modified: dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-3.patch (from r16257, dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch	Thu Sep  9 04:32:24 2010	(r16257, copy source)
+++ dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-3.patch	Fri Sep 10 01:08:49 2010	(r16261)
@@ -67,7 +67,7 @@
  
  	rtl_phy_write(ioaddr, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0));
  
-@@ -1776,12 +1801,18 @@ static void rtl8168d_1_hw_phy_config(void __iomem *ioaddr)
+@@ -1776,12 +1801,16 @@ static void rtl8168d_1_hw_phy_config(void __iomem *ioaddr)
  	mdio_plus_minus(ioaddr, 0x02, 0x0100, 0x0600);
  	mdio_plus_minus(ioaddr, 0x03, 0x0000, 0xe000);
  
@@ -84,8 +84,6 @@
  }
  
 -static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr)
-+MODULE_FIRMWARE("rtl8168d-1.fw");
-+
 +static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp)
  {
  	static struct phy_reg phy_reg_init_0[] = {
@@ -99,7 +97,7 @@
  
  	rtl_phy_write(ioaddr, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0));
  
-@@ -1861,11 +1896,17 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr)
+@@ -1861,9 +1896,13 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr)
  	mdio_write(ioaddr, 0x1f, 0x0002);
  	mdio_patch(ioaddr, 0x0f, 0x0017);
  
@@ -115,11 +113,7 @@
 +	}
  }
  
-+MODULE_FIRMWARE("rtl8168d-2.fw");
-+
  static void rtl8168d_3_hw_phy_config(void __iomem *ioaddr)
- {
- 	struct phy_reg phy_reg_init[] = {
 @@ -2001,10 +2039,10 @@ static int rtl_hw_phy_config(struct net_device *dev)
  		rtl8168cp_2_hw_phy_config(ioaddr);
  		break;

Modified: dists/sid/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/22	Fri Sep 10 00:55:00 2010	(r16260)
+++ dists/sid/linux-2.6/debian/patches/series/22	Fri Sep 10 01:08:49 2010	(r16261)
@@ -116,3 +116,5 @@
 + bugfix/all/tun-Dont-add-sysfs-attributes-to-devices-without-sysfs-dirs.patch
 + features/all/staging-add-initial-release-of-brcm80211.patch
 + bugfix/all/brcm80211-Fix-some-initialisation-failure-paths.patch
+- features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
++ features/all/r8169-rtl8168d-1-2-request_firmware-3.patch