summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-12 14:38:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-12 14:38:34 -0700
commit2caa731819a633bec5a56736e64c562b7e193666 (patch)
treee93f5c50c33c7cf5a9cc3ea29dd1d868b4f14d5c /include/linux
parent589bf8d52b5bbb580962438ad9403ec6853bc12b (diff)
parent30fc24b5cbc55f9e6c686e2710cc812419bddc0c (diff)
downloadop-kernel-dev-2caa731819a633bec5a56736e64c562b7e193666.zip
op-kernel-dev-2caa731819a633bec5a56736e64c562b7e193666.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: Prevent AER driver from being loaded on non-root port PCIE devices PCI: get larger bridge ranges when space is available PCI: pci.c: fix kernel-doc notation PCI quirk: TI XIO200a erroneously reports support for fast b2b transfers PCI PM: Read device power state from register after updating it PCI: remove pci_assign_resource_fixed() PCI: PCIe portdrv: remove "-driver" from driver name
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pci_ids.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index da1fda8..f490e7a 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -776,6 +776,7 @@
#define PCI_DEVICE_ID_TI_X515 0x8036
#define PCI_DEVICE_ID_TI_XX12 0x8039
#define PCI_DEVICE_ID_TI_XX12_FM 0x803b
+#define PCI_DEVICE_ID_TI_XIO2000A 0x8231
#define PCI_DEVICE_ID_TI_1130 0xac12
#define PCI_DEVICE_ID_TI_1031 0xac13
#define PCI_DEVICE_ID_TI_1131 0xac15
OpenPOWER on IntegriCloud