commit 3fd069f6814f96de1e81edc604235e2c67be0a02
author Jon Loeliger <jdl@freescale.com> Wed Jun 28 08:45:07 2006 -0500
committer Jon Loeliger <jdl@freescale.com> Wed Jun 28 08:45:07 2006 -0500
tree e8f33f38164b5af7dbadeed1a984877880db3059
parent f0a782583fb526e7606bb608c29314eac5833a8b
parent 90c860c3f5ad1083220f5d8a3f51aa2511c6edca

Merge branch 'mpc86xx'

drivers/rtl8139.c

diff --git a/drivers/rtl8139.c b/drivers/rtl8139.c
index 848d1d1..afe1a4f 100644
--- a/drivers/rtl8139.c
+++ b/drivers/rtl8139.c
@@ -196,7 +196,7 @@
 
 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},
        {}
 };
 

include/pci_ids.h

diff --git a/include/pci_ids.h b/include/pci_ids.h
index 8cc3ec0..3b10452 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