summaryrefslogtreecommitdiff
path: root/include/linux/pci_ids.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-20 01:05:35 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-20 01:05:35 -0500
commit4af452bd03ec73efb1d3bf560d6d22b12d96752e (patch)
tree25b79c5aa3f35da523b4a1f89e7734070a8931ce /include/linux/pci_ids.h
parent625876f32ed63af262db3d0ac8178d2c0f510636 (diff)
parent3bedff1d73b86e0cf52634efb447e9ada08f2cc6 (diff)
downloadlwn-4af452bd03ec73efb1d3bf560d6d22b12d96752e.tar.gz
lwn-4af452bd03ec73efb1d3bf560d6d22b12d96752e.zip
Merge branch 'master'
Diffstat (limited to 'include/linux/pci_ids.h')
-rw-r--r--include/linux/pci_ids.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 7b387faedb4d..efb60d06caab 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -620,6 +620,7 @@
#define PCI_DEVICE_ID_SI_961 0x0961
#define PCI_DEVICE_ID_SI_962 0x0962
#define PCI_DEVICE_ID_SI_963 0x0963
+#define PCI_DEVICE_ID_SI_965 0x0965
#define PCI_DEVICE_ID_SI_5511 0x5511
#define PCI_DEVICE_ID_SI_5513 0x5513
#define PCI_DEVICE_ID_SI_5518 0x5518
@@ -1234,6 +1235,7 @@
#define PCI_DEVICE_ID_VIA_8703_51_0 0x3148
#define PCI_DEVICE_ID_VIA_8237_SATA 0x3149
#define PCI_DEVICE_ID_VIA_XN266 0x3156
+#define PCI_DEVICE_ID_VIA_6410 0x3164
#define PCI_DEVICE_ID_VIA_8754C_0 0x3168
#define PCI_DEVICE_ID_VIA_8235 0x3177
#define PCI_DEVICE_ID_VIA_8385_0 0x3188