Imported linux-2.6.27.39 suse/xen patches.

[ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.drivers / bnx2-Add-PCI-ID-for-5716S

diff --git a/src/patches/suse-2.6.27.31/patches.drivers/bnx2-Add-PCI-ID-for-5716S b/src/patches/suse-2.6.27.31/patches.drivers/bnx2-Add-PCI-ID-for-5716S
deleted file mode 100644 (file)
index b18b9a0..0000000
--- a/src/patches/suse-2.6.27.31/patches.drivers/bnx2-Add-PCI-ID-for-5716S
+++ /dev/null
@@ -1,40 +0,0 @@
-Commit-Id: 1caacecb7cb2b72e798f06a32b5061075cf397fa
-From: Michael Chan <mchan@broadcom.com>
-Date: Wed, 12 Nov 2008 16:01:12 -0800
-Acked-by: Karsten Keil <kkeil@novell.com>
-Subject: [PATCH] bnx2: Add PCI ID for 5716S.
-
-Signed-off-by: Michael Chan <mchan@broadcom.com>
-Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
-Signed-off-by: Benjamin Li <benli@broadcom.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-
-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, }
- };
-