[kernel] r15207 - in dists/trunk/linux-2.6/debian/patches: features/all series

[Ben Hutchings]

Author: benh
Date: Fri Feb 19 02:04:25 2010
New Revision: 15207

Log:
Fix up features/all/r8169-rtl8168d-1-2-request_firmware-2.patch for 2.6.33-rc8

Modified:
   dists/trunk/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch	Fri Feb 19 02:00:53 2010	(r15206)
+++ dists/trunk/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch	Fri Feb 19 02:04:25 2010	(r15207)
@@ -7,7 +7,7 @@
 
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
-@@ -2170,6 +2170,7 @@ config R8169
+@@ -2172,6 +2172,7 @@ config R8169
  	depends on PCI
  	select CRC32
  	select MII
@@ -48,7 +48,7 @@
 +
  static void rtl8169s_hw_phy_config(void __iomem *ioaddr)
  {
- 	struct phy_reg phy_reg_init[] = {
+ 	static const struct phy_reg phy_reg_init[] = {
 @@ -1691,7 +1709,7 @@ static void rtl8168c_4_hw_phy_config(void __iomem *ioaddr)
  	rtl8168c_3_hw_phy_config(ioaddr);
  }
@@ -56,7 +56,7 @@
 -static void rtl8168d_1_hw_phy_config(void __iomem *ioaddr)
 +static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp)
  {
- 	static struct phy_reg phy_reg_init_0[] = {
+ 	static const struct phy_reg phy_reg_init_0[] = {
  		{ 0x1f, 0x0001 },
 @@ -1719,6 +1737,8 @@ static void rtl8168d_1_hw_phy_config(void __iomem *ioaddr)
  		{ 0x05, 0x8332 },
@@ -88,7 +88,7 @@
 +
 +static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp)
  {
- 	static struct phy_reg phy_reg_init_0[] = {
+ 	static const struct phy_reg phy_reg_init_0[] = {
  		{ 0x1f, 0x0001 },
 @@ -1808,6 +1836,8 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr)
  		{ 0x05, 0x8332 },
@@ -119,7 +119,7 @@
 +
  static void rtl8168d_3_hw_phy_config(void __iomem *ioaddr)
  {
- 	struct phy_reg phy_reg_init[] = {
+ 	static const 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/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 02:00:53 2010	(r15206)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 02:04:25 2010	(r15207)
@@ -12,8 +12,7 @@
 + features/all/rt28x0sta-use-request_firmware.patch
 + features/all/export-unionfs-symbols.patch
 + features/all/lgs8gxx-lgs8g75-request_firmware.patch
-# FIXME: fails to apply
-#+ features/all/r8169-rtl8168d-1-2-request_firmware.patch
++ features/all/r8169-rtl8168d-1-2-request_firmware.patch
 + features/all/sound-pci-cs46xx-request_firmware.patch
 
 + features/all/module-firmware/0025-tty-declare-MODULE_FIRMWARE-in-various-drivers.patch