leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mpc86xx'

Browse Source
This commit is contained in:
Jon Loeliger 2006-06-28 08:45:07 -05:00
commit 152a44c6cd
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/rtl8139.c
View File

@ -196,7 +196,7 @@ static void rtl_disable(struct eth_device *dev);
static struct pci_device_id supported[] = { static struct pci_device_id supported[] = {
{PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139}, {PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139},
{0x1186, 0x1300}, {PCI_VENDOR_ID_DLINK, PCI_DEVICE_ID_DLINK_8139},
{} {}
}; };

3
include/pci_ids.h
View File

@ -1045,6 +1045,9 @@
#define PCI_DEVICE_ID_REALTEK_8139 0x8139 #define PCI_DEVICE_ID_REALTEK_8139 0x8139
#define PCI_DEVICE_ID_REALTEK_8169 0x8169 #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_VENDOR_ID_XILINX 0x10ee
#define PCI_DEVICE_ID_TURBOPAM 0x4020 #define PCI_DEVICE_ID_TURBOPAM 0x4020