summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorCesar Eduardo Barros <cesarb@cesarb.net>2009-01-15 05:34:04 +0100
committerDavid S. Miller <davem@davemloft.net>2009-01-21 23:03:41 +0100
commit5ec99fdf8e1a6ee90fce22c2fce94871ab44e8ba (patch)
tree9c2aac1ebfa017b0b02c35a38754403fa2622e94 /drivers
parentsc92031: inline SC92031_DESCRIPTION (diff)
downloadlinux-5ec99fdf8e1a6ee90fce22c2fce94871ab44e8ba.tar.xz
linux-5ec99fdf8e1a6ee90fce22c2fce94871ab44e8ba.zip
sc92031: use device id directly instead of made-up name
Instead of making up a name for the device ids, put them directly in the device id table. Also move the vendor id to pci_ids.h. Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/sc92031.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index d24acdcdb157..00dfddbf2f9b 100644
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -31,10 +31,6 @@
#include <asm/irq.h>
-#define PCI_VENDOR_ID_SILAN 0x1904
-#define PCI_DEVICE_ID_SILAN_SC92031 0x2031
-#define PCI_DEVICE_ID_SILAN_8139D 0x8139
-
#define SC92031_NAME "sc92031"
/* BAR 0 is MMIO, BAR 1 is PIO */
@@ -1592,8 +1588,8 @@ out:
}
static struct pci_device_id sc92031_pci_device_id_table[] __devinitdata = {
- { PCI_DEVICE(PCI_VENDOR_ID_SILAN, PCI_DEVICE_ID_SILAN_SC92031) },
- { PCI_DEVICE(PCI_VENDOR_ID_SILAN, PCI_DEVICE_ID_SILAN_8139D) },
+ { PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x2031) },
+ { PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x8139) },
{ 0, }
};
MODULE_DEVICE_TABLE(pci, sc92031_pci_device_id_table);