From 8b88055a9aba17dbda53559734e9982a3d340236 Mon Sep 17 00:00:00 2001
From: Jeff Mahoney <jeffm@suse.com>
Date: Thu, 11 Feb 2010 10:26:38 +0000
Subject: [PATCH] --- yaml --- r: 184301 b: refs/heads/master c:
 25cca5352712561fba97bd37c495593d641c1d39 h: refs/heads/master i:   184299:
 3bdeaed2166717162aa4fe8b42085211bc8a3126 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/ipg.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ee32b7309e0d..daf7f9b1bc08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 069c474e88bb7753183f1eadbd7786c27888c8e3
+refs/heads/master: 25cca5352712561fba97bd37c495593d641c1d39
diff --git a/trunk/drivers/net/ipg.c b/trunk/drivers/net/ipg.c
index dbdebd5efe86..3ca49e348c9d 100644
--- a/trunk/drivers/net/ipg.c
+++ b/trunk/drivers/net/ipg.c
@@ -88,7 +88,6 @@ static const char *ipg_brand_name[] = {
 	"Sundance Technology ST2021 based NIC",
 	"Tamarack Microelectronics TC9020/9021 based NIC",
 	"Tamarack Microelectronics TC9020/9021 based NIC",
-	"D-Link NIC",
 	"D-Link NIC IP1000A"
 };
 
@@ -97,8 +96,7 @@ static DEFINE_PCI_DEVICE_TABLE(ipg_pci_tbl) = {
 	{ PCI_VDEVICE(SUNDANCE,	0x2021), 1 },
 	{ PCI_VDEVICE(SUNDANCE,	0x1021), 2 },
 	{ PCI_VDEVICE(DLINK,	0x9021), 3 },
-	{ PCI_VDEVICE(DLINK,	0x4000), 4 },
-	{ PCI_VDEVICE(DLINK,	0x4020), 5 },
+	{ PCI_VDEVICE(DLINK,	0x4020), 4 },
 	{ 0, }
 };