diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:38:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:38:36 -0500 |
| commit | 4da5cc2cec8caec1d357053e85a7a32f243f93a1 (patch) | |
| tree | 3f8b603af4af88f86be7ec1d4e3639a7fc9dd1a6 /include/linux/pci_ids.h | |
| parent | 25c862cc9ea9b312c25a9f577f91b973131f1261 (diff) | |
| parent | c6f43290ae687c11cdcd150d8bfeb57ec29cfa5b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index a17e171384ef..4f01710485cd 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -377,6 +377,10 @@ | |||
| 377 | #define PCI_DEVICE_ID_NS_87560_USB 0x0012 | 377 | #define PCI_DEVICE_ID_NS_87560_USB 0x0012 |
| 378 | #define PCI_DEVICE_ID_NS_83815 0x0020 | 378 | #define PCI_DEVICE_ID_NS_83815 0x0020 |
| 379 | #define PCI_DEVICE_ID_NS_83820 0x0022 | 379 | #define PCI_DEVICE_ID_NS_83820 0x0022 |
| 380 | #define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d | ||
| 381 | #define PCI_DEVICE_ID_NS_CS5535_AUDIO 0x002e | ||
| 382 | #define PCI_DEVICE_ID_NS_CS5535_USB 0x002f | ||
| 383 | #define PCI_DEVICE_ID_NS_CS5535_VIDEO 0x0030 | ||
| 380 | #define PCI_DEVICE_ID_NS_SATURN 0x0035 | 384 | #define PCI_DEVICE_ID_NS_SATURN 0x0035 |
| 381 | #define PCI_DEVICE_ID_NS_SCx200_BRIDGE 0x0500 | 385 | #define PCI_DEVICE_ID_NS_SCx200_BRIDGE 0x0500 |
| 382 | #define PCI_DEVICE_ID_NS_SCx200_SMI 0x0501 | 386 | #define PCI_DEVICE_ID_NS_SCx200_SMI 0x0501 |