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

[Ben Hutchings]

Author: benh
Date: Sun Jan 17 23:29:17 2010
New Revision: 14949

Log:
bnx2: Add PCI ID for Broadcom 5716S

Added:
   dists/lenny/linux-2.6/debian/patches/features/all/bnx2-Add-PCI-ID-for-5716S.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/22

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Sun Jan 17 23:00:25 2010	(r14948)
+++ dists/lenny/linux-2.6/debian/changelog	Sun Jan 17 23:29:17 2010	(r14949)
@@ -13,7 +13,7 @@
   * dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips
     (Closes: #515533)
   * x86: Increase MIN_GAP to include randomized stack (Closes: #559035)
-  * bnx2: Add PCI ID for Broadcom 5716 (Closes: #565353)
+  * bnx2: Add PCI IDs for Broadcom 5716 and 5716S (Closes: #565353)
 
  -- maximilian attems <maks at debian.org>  Mon, 28 Dec 2009 23:44:19 +0100
 

Added: dists/lenny/linux-2.6/debian/patches/features/all/bnx2-Add-PCI-ID-for-5716S.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/features/all/bnx2-Add-PCI-ID-for-5716S.patch	Sun Jan 17 23:29:17 2010	(r14949)
@@ -0,0 +1,45 @@
+From 1caacecb7cb2b72e798f06a32b5061075cf397fa Mon Sep 17 00:00:00 2001
+From: Michael Chan <mchan at broadcom.com>
+Date: Wed, 12 Nov 2008 16:01:12 -0800
+Subject: [PATCH] bnx2: Add PCI ID for 5716S.
+
+Signed-off-by: Michael Chan <mchan at broadcom.com>
+Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
+Signed-off-by: Benjamin Li <benli at broadcom.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/bnx2.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
+index 51b163a..49ebb50 100644
+--- a/drivers/net/bnx2.c
++++ b/drivers/net/bnx2.c
+@@ -89,6 +89,7 @@ typedef enum {
+ 	BCM5709,
+ 	BCM5709S,
+ 	BCM5716,
++	BCM5716S,
+ } board_t;
+ 
+ /* indexed by board_t, above */
+@@ -105,6 +106,7 @@ static struct {
+ 	{ "Broadcom NetXtreme II BCM5709 1000Base-T" },
+ 	{ "Broadcom NetXtreme II BCM5709 1000Base-SX" },
+ 	{ "Broadcom NetXtreme II BCM5716 1000Base-T" },
++	{ "Broadcom NetXtreme II BCM5716 1000Base-SX" },
+ 	};
+ 
+ static DEFINE_PCI_DEVICE_TABLE(bnx2_pci_tbl) = {
+@@ -128,6 +130,8 @@ static DEFINE_PCI_DEVICE_TABLE(bnx2_pci_tbl) = {
+ 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5709S },
+ 	{ PCI_VENDOR_ID_BROADCOM, 0x163b,
+ 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716 },
++	{ PCI_VENDOR_ID_BROADCOM, 0x163c,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716 },
+ 	{ 0, }
+ };
+ 
+-- 
+1.6.6
+

Modified: dists/lenny/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/22	Sun Jan 17 23:00:25 2010	(r14948)
+++ dists/lenny/linux-2.6/debian/patches/series/22	Sun Jan 17 23:29:17 2010	(r14949)
@@ -6,3 +6,4 @@
 + bugfix/all/dmfe-tulip-Let-dmfe-handle-DM910x-except-SPARC-onboard.patch
 + bugfix/all/x86-Increase-MIN_GAP-to-include-randomized-stack.patch
 + features/all/bnx2-Add-PCI-ID-for-5716.patch
++ features/all/bnx2-Add-PCI-ID-for-5716S.patch