* [PATCH 1/7] be2net: remove unused pci device id
@ 2010-02-09 11:28 Ajit Khaparde
2010-02-12 20:29 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ajit Khaparde @ 2010-02-09 11:28 UTC (permalink / raw)
To: davem, netdev
We are not going to use this device id.
Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
---
drivers/net/benet/be.h | 6 ++----
drivers/net/benet/be_main.c | 1 -
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index 5bc7459..2420131 100644
--- a/drivers/net/benet/be.h
+++ b/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/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 626b76c..f9e18eb 100644
--- a/drivers/net/benet/be_main.c
+++ b/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);
--
1.6.3.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/7] be2net: remove unused pci device id
2010-02-09 11:28 [PATCH 1/7] be2net: remove unused pci device id Ajit Khaparde
@ 2010-02-12 20:29 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-02-12 20:29 UTC (permalink / raw)
To: ajitk, ajitkhaparde; +Cc: netdev
From: Ajit Khaparde <ajitkhaparde@gmail.com>
Date: Tue, 9 Feb 2010 16:58:35 +0530
> We are not going to use this device id.
>
> Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
Applied to net-next-2.6
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-02-12 20:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-09 11:28 [PATCH 1/7] be2net: remove unused pci device id Ajit Khaparde
2010-02-12 20:29 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).