diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-06-28 08:45:07 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-06-28 08:45:07 -0500 |
| commit | 152a44c6cd0464416199de082a95074da18bbc12 (patch) | |
| tree | e8f33f38164b5af7dbadeed1a984877880db3059 | |
| parent | 894b773c8678ce68b01c99b02ffad236e470458b (diff) | |
| parent | da012ab661fd4ab169dd7b9b32201a4df62cf34a (diff) | |
| download | u-boot-imx-152a44c6cd0464416199de082a95074da18bbc12.zip u-boot-imx-152a44c6cd0464416199de082a95074da18bbc12.tar.gz u-boot-imx-152a44c6cd0464416199de082a95074da18bbc12.tar.bz2 | |
Merge branch 'mpc86xx'
| -rw-r--r-- | drivers/rtl8139.c | 2 | ||||
| -rw-r--r-- | include/pci_ids.h | 3 |
2 files changed, 4 insertions, 1 deletions
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 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 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 |