[kernel] r15622 - dists/trunk/linux-2.6/debian/patches/features/all

[Ben Hutchings]

Author: benh
Date: Tue May  4 23:47:24 2010
New Revision: 15622

Log:
Backport to 2.6.33 as suggested in follow-up by dwmw2

Modified:
   dists/trunk/linux-2.6/debian/patches/features/all/phylib-Add-module-table-to-all-existing-phy-drivers.patch

Modified: dists/trunk/linux-2.6/debian/patches/features/all/phylib-Add-module-table-to-all-existing-phy-drivers.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/phylib-Add-module-table-to-all-existing-phy-drivers.patch	Tue May  4 23:23:13 2010	(r15621)
+++ dists/trunk/linux-2.6/debian/patches/features/all/phylib-Add-module-table-to-all-existing-phy-drivers.patch	Tue May  4 23:47:24 2010	(r15622)
@@ -1,10 +1,9 @@
-From 4e4f10f6498bc5038c0a110b5f21682fcb5578d7 Mon Sep 17 00:00:00 2001
 From: David Woodhouse <dwmw2 at infradead.org>
-Date: Fri, 2 Apr 2010 01:05:56 +0000
+Date: Fri, 02 Apr 2010 12:05:56 +0100
 Subject: [PATCH 2/2] phylib: Add module table to all existing phy drivers
 
 Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
-Signed-off-by: David S. Miller <davem at davemloft.net>
+[bwh: Backport to 2.6.33 as suggested in follow-up by dwmw2]
 ---
  drivers/net/phy/bcm63xx.c  |    8 ++++++++
  drivers/net/phy/broadcom.c |   16 ++++++++++++++++
@@ -57,7 +56,7 @@
 +	{ PHY_ID_BCM50610, 0xfffffff0 },
 +	{ PHY_ID_BCM50610M, 0xfffffff0 },
 +	{ PHY_ID_BCM57780, 0xfffffff0 },
-+	{ PHY_ID_BCMAC131, 0xfffffff0 },
++	{ 0x0143bc70, 0xfffffff0 },
 +	{ }
 +};
 +
@@ -262,5 +261,5 @@
 +
 +MODULE_DEVICE_TABLE(mdio, vitesse_tbl);
 -- 
-1.7.0.3
+1.6.6.1