aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-09-24 11:19:53 +0200
committerIngo Molnar <mingo@elte.hu>2010-09-24 11:19:53 +0200
commit7329cf0201f48695862e334828a108aa7175e955 (patch)
tree9ebea4a0394d14a00b98cc4ee6f726588956c168 /include/linux
parentx86, setup: Fix earlyprintk=serial,0x3f8,115200 (diff)
parentx86/amd-iommu: Fix rounding-bug in __unmap_single (diff)
downloadlinux-dev-7329cf0201f48695862e334828a108aa7175e955.tar.xz
linux-dev-7329cf0201f48695862e334828a108aa7175e955.zip
Merge branch 'amd-iommu/2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pci_ids.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 10d33309e9a6..570fddeb0388 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -393,6 +393,9 @@
#define PCI_DEVICE_ID_VLSI_82C147 0x0105
#define PCI_DEVICE_ID_VLSI_VAS96011 0x0702
+/* AMD RD890 Chipset */
+#define PCI_DEVICE_ID_RD890_IOMMU 0x5a23
+
#define PCI_VENDOR_ID_ADL 0x1005
#define PCI_DEVICE_ID_ADL_2301 0x2301