aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pci_ids.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-19 16:31:03 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-19 16:31:03 -0800
commit44779149e91ec8e684be23e06dc05197e367a45f (patch)
treeef1f38740133466f08d12c0a497333d47ab8f7a4 /include/linux/pci_ids.h
parent8ee3f402676bf59caa454b7171ae09c8ac136627 (diff)
parent17514e8a6f1836a5c95b1f18d2bc0493ad732cf0 (diff)
downloadkernel_samsung_smdk4412-44779149e91ec8e684be23e06dc05197e367a45f.zip
kernel_samsung_smdk4412-44779149e91ec8e684be23e06dc05197e367a45f.tar.gz
kernel_samsung_smdk4412-44779149e91ec8e684be23e06dc05197e367a45f.tar.bz2
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
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 7b387fa..efb60d0 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