diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-08 15:14:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-08 15:14:27 -0400 |
| commit | fe5a2de17e65d82b9d502da80ccb5a689d03fdd2 (patch) | |
| tree | 546492b849c1113ac6889395c353ae577860c7fd /include | |
| parent | 1e5de2837c166535f9bb4232bfe97ea1f9fc7a1c (diff) | |
| parent | 4660897e6c2daa198fc8e3f47ae2a4aef69c80b0 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
qd65xx: fix PIO mode selection
sis5513: adding PCI-ID
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 9a03b47da603..5b1c9994f89a 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -661,6 +661,7 @@ | |||
| 661 | #define PCI_DEVICE_ID_SI_965 0x0965 | 661 | #define PCI_DEVICE_ID_SI_965 0x0965 |
| 662 | #define PCI_DEVICE_ID_SI_966 0x0966 | 662 | #define PCI_DEVICE_ID_SI_966 0x0966 |
| 663 | #define PCI_DEVICE_ID_SI_968 0x0968 | 663 | #define PCI_DEVICE_ID_SI_968 0x0968 |
| 664 | #define PCI_DEVICE_ID_SI_1180 0x1180 | ||
| 664 | #define PCI_DEVICE_ID_SI_5511 0x5511 | 665 | #define PCI_DEVICE_ID_SI_5511 0x5511 |
| 665 | #define PCI_DEVICE_ID_SI_5513 0x5513 | 666 | #define PCI_DEVICE_ID_SI_5513 0x5513 |
| 666 | #define PCI_DEVICE_ID_SI_5517 0x5517 | 667 | #define PCI_DEVICE_ID_SI_5517 0x5517 |