diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 23:54:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 23:54:49 -0400 |
| commit | ca9a702e50287cf429f1c12832319a26a715e70b (patch) | |
| tree | a29c7c68d2945c47d058b42ecd4475fed5c19fe2 /include | |
| parent | bbe5a96f678efcad83de8f900ab4ab963a99c805 (diff) | |
| parent | d15d6e6cc340566d53d953ffdec2c9e96816fa52 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: Add pata_atp867x driver for Artop/Acard ATP867X controllers
pata_amd: do not filter out valid modes in nv_mode_filter
sata_promise: update reset code
sata_promise: disable hotplug on 1st gen chips
libata: fix spurious WARN_ON_ONCE() on port freeze
ahci: restore pci_intx() handling
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 8975add8668f..3b6b788fe2b5 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1529,6 +1529,8 @@ | |||
| 1529 | #define PCI_DEVICE_ID_ARTOP_ATP860R 0x0007 | 1529 | #define PCI_DEVICE_ID_ARTOP_ATP860R 0x0007 |
| 1530 | #define PCI_DEVICE_ID_ARTOP_ATP865 0x0008 | 1530 | #define PCI_DEVICE_ID_ARTOP_ATP865 0x0008 |
| 1531 | #define PCI_DEVICE_ID_ARTOP_ATP865R 0x0009 | 1531 | #define PCI_DEVICE_ID_ARTOP_ATP865R 0x0009 |
| 1532 | #define PCI_DEVICE_ID_ARTOP_ATP867A 0x000A | ||
| 1533 | #define PCI_DEVICE_ID_ARTOP_ATP867B 0x000B | ||
| 1532 | #define PCI_DEVICE_ID_ARTOP_AEC7610 0x8002 | 1534 | #define PCI_DEVICE_ID_ARTOP_AEC7610 0x8002 |
| 1533 | #define PCI_DEVICE_ID_ARTOP_AEC7612UW 0x8010 | 1535 | #define PCI_DEVICE_ID_ARTOP_AEC7612UW 0x8010 |
| 1534 | #define PCI_DEVICE_ID_ARTOP_AEC7612U 0x8020 | 1536 | #define PCI_DEVICE_ID_ARTOP_AEC7612U 0x8020 |