summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-06-28 08:45:07 -0500
committerJon Loeliger <jdl@freescale.com>2006-06-28 08:45:07 -0500
commit152a44c6cd0464416199de082a95074da18bbc12 (patch)
treee8f33f38164b5af7dbadeed1a984877880db3059
parent894b773c8678ce68b01c99b02ffad236e470458b (diff)
parentda012ab661fd4ab169dd7b9b32201a4df62cf34a (diff)
Merge branch 'mpc86xx'
-rw-r--r--drivers/rtl8139.c2
-rw-r--r--include/pci_ids.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/rtl8139.c b/drivers/rtl8139.c
index 848d1d177a..afe1a4fdaf 100644
--- a/drivers/rtl8139.c
+++ b/drivers/rtl8139.c
@@ -196,7 +196,7 @@ static void rtl_disable(struct eth_device *dev);
static struct pci_device_id supported[] = {
{PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139},
- {0x1186, 0x1300},
+ {PCI_VENDOR_ID_DLINK, PCI_DEVICE_ID_DLINK_8139},
{}
};
diff --git a/include/pci_ids.h b/include/pci_ids.h
index 8cc3ec0a23..3b10452416 100644
--- a/include/pci_ids.h
+++ b/include/pci_ids.h
@@ -1045,6 +1045,9 @@
#define PCI_DEVICE_ID_REALTEK_8139 0x8139
#define PCI_DEVICE_ID_REALTEK_8169 0x8169
+#define PCI_VENDOR_ID_DLINK 0x1186
+#define PCI_DEVICE_ID_DLINK_8139 0x1300
+
#define PCI_VENDOR_ID_XILINX 0x10ee
#define PCI_DEVICE_ID_TURBOPAM 0x4020