summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-30 20:16:30 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-30 20:16:30 +0200
commit6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (patch)
tree09933113cf28f253db1dd539463bdab741d67139 /include
parent[PATCH] ppc32 8xx: fix warnings in m8xx_setup.c (diff)
parentMerge HEAD from /spare/repo/linux-2.6/.git (diff)
downloadlinux-6b39374a27eb4be7e9d82145ae270ba02ea90dc8.tar.xz
linux-6b39374a27eb4be7e9d82145ae270ba02ea90dc8.zip
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci_ids.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 499a5325f67f..d513c1634006 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2145,6 +2145,7 @@
#define PCI_DEVICE_ID_ENE_1225 0x1225
#define PCI_DEVICE_ID_ENE_1410 0x1410
#define PCI_DEVICE_ID_ENE_1420 0x1420
+#define PCI_VENDOR_ID_CHELSIO 0x1425
#define PCI_VENDOR_ID_SYBA 0x1592
#define PCI_DEVICE_ID_SYBA_2P_EPP 0x0782