From d86706493d4ed55a358a8493cb8bff91c1ce9a5d Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajitkhaparde@gmail.com>
Date: Tue, 9 Feb 2010 01:28:35 +0000
Subject: [PATCH] --- yaml --- r: 184012 b: refs/heads/master c:
 e254f6ecaeb4e7c0588e739bf4641df0e8c22bba h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/benet/be.h      | 6 ++----
 trunk/drivers/net/benet/be_main.c | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 63aa3d3ca42d..696b49c9e655 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 830a8a976ff2236ebc383e9a06f7872ed9243bfb
+refs/heads/master: e254f6ecaeb4e7c0588e739bf4641df0e8c22bba
diff --git a/trunk/drivers/net/benet/be.h b/trunk/drivers/net/benet/be.h
index 5bc74590c73e..242013157f20 100644
--- a/trunk/drivers/net/benet/be.h
+++ b/trunk/drivers/net/benet/be.h
@@ -44,16 +44,14 @@
 #define BE_DEVICE_ID1		0x211
 #define BE_DEVICE_ID2		0x221
 #define OC_DEVICE_ID1		0x700
-#define OC_DEVICE_ID2		0x701
-#define OC_DEVICE_ID3		0x710
+#define OC_DEVICE_ID2		0x710
 
 static inline char *nic_name(struct pci_dev *pdev)
 {
 	switch (pdev->device) {
 	case OC_DEVICE_ID1:
-	case OC_DEVICE_ID2:
 		return OC_NAME;
-	case OC_DEVICE_ID3:
+	case OC_DEVICE_ID2:
 		return OC_NAME1;
 	case BE_DEVICE_ID2:
 		return BE3_NAME;
diff --git a/trunk/drivers/net/benet/be_main.c b/trunk/drivers/net/benet/be_main.c
index 0014a4e86446..0779f6b5e29b 100644
--- a/trunk/drivers/net/benet/be_main.c
+++ b/trunk/drivers/net/benet/be_main.c
@@ -34,7 +34,6 @@ static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = {
 	{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) },
 	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },
 	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },
-	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) },
 	{ 0 }
 };
 MODULE_DEVICE_TABLE(pci, be_dev_ids);