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

[Ben Hutchings]

Author: benh
Date: Sun Jan 17 23:00:25 2010
New Revision: 14948

Log:
bnx2: Add PCI ID for Broadcom 5716 (Closes: #565353)

Added:
   dists/lenny/linux-2.6/debian/patches/features/all/bnx2-Add-PCI-ID-for-5716.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 22:50:33 2010	(r14947)
+++ dists/lenny/linux-2.6/debian/changelog	Sun Jan 17 23:00:25 2010	(r14948)
@@ -13,6 +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)
 
  -- 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-5716.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-5716.patch	Sun Jan 17 23:00:25 2010	(r14948)
@@ -0,0 +1,48 @@
+From 7bb0a04fcd610e5db59690332b2a46b6068c8bc3 Mon Sep 17 00:00:00 2001
+From: Michael Chan <mchan at broadcom.com>
+Date: Mon, 14 Jul 2008 22:37:47 -0700
+Subject: [PATCH] bnx2: Add PCI ID for 5716.
+
+Signed-off-by: Michael Chan <mchan 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 |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
+index e9cfb02..989d4b6 100644
+--- a/drivers/net/bnx2.c
++++ b/drivers/net/bnx2.c
+@@ -87,6 +87,7 @@ typedef enum {
+ 	BCM5708S,
+ 	BCM5709,
+ 	BCM5709S,
++	BCM5716,
+ } board_t;
+ 
+ /* indexed by board_t, above */
+@@ -102,9 +103,10 @@ static struct {
+ 	{ "Broadcom NetXtreme II BCM5708 1000Base-SX" },
+ 	{ "Broadcom NetXtreme II BCM5709 1000Base-T" },
+ 	{ "Broadcom NetXtreme II BCM5709 1000Base-SX" },
++	{ "Broadcom NetXtreme II BCM5716 1000Base-T" },
+ 	};
+ 
+-static struct pci_device_id bnx2_pci_tbl[] = {
++static DEFINE_PCI_DEVICE_TABLE(bnx2_pci_tbl) = {
+ 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
+ 	  PCI_VENDOR_ID_HP, 0x3101, 0, 0, NC370T },
+ 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
+@@ -123,6 +125,8 @@ static struct pci_device_id bnx2_pci_tbl[] = {
+ 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5709 },
+ 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5709S,
+ 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5709S },
++	{ PCI_VENDOR_ID_BROADCOM, 0x163b,
++	  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 22:50:33 2010	(r14947)
+++ dists/lenny/linux-2.6/debian/patches/series/22	Sun Jan 17 23:00:25 2010	(r14948)
@@ -5,3 +5,4 @@
 + features/all/atl1c-kbuild.patch
 + 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