summaryrefslogtreecommitdiff
path: root/include/pci_ids.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-10-24 17:08:31 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-10-24 17:08:31 +0200
commitd97370feca2a589dad42154577bb4615a0347852 (patch)
tree5a3f85d24e07425977b7019017ae1615c0f12ce7 /include/pci_ids.h
parent9fa48022e5883a0826a98979c0156f6ac5a0ef79 (diff)
parent47a6989c10685d2ab3efcf95228ce50d2a496d3e (diff)
downloadu-boot-imx-d97370feca2a589dad42154577bb4615a0347852.zip
u-boot-imx-d97370feca2a589dad42154577bb4615a0347852.tar.gz
u-boot-imx-d97370feca2a589dad42154577bb4615a0347852.tar.bz2
Merge with /home/wd/git/u-boot/master
(Conflicts between Jon Loeliger's and Matthew McClintock's tree were resolved by in favour of Jon's version.)
Diffstat (limited to 'include/pci_ids.h')
-rw-r--r--include/pci_ids.h3
1 files changed, 3 insertions, 0 deletions
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