summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-27 12:22:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-27 12:22:21 -0700
commit6a6aa2b7e47c725b5256ff0f7462fe1247cabf5a (patch)
treedcd8e549193e7aedcdcfb34c13177eceda5b29f4 /include
parentf0619343ce782a731f55b8ba06d9a7e7d28a0fb8 (diff)
parent7329cf0201f48695862e334828a108aa7175e955 (diff)
downloadlinux-3.10-6a6aa2b7e47c725b5256ff0f7462fe1247cabf5a.tar.gz
linux-3.10-6a6aa2b7e47c725b5256ff0f7462fe1247cabf5a.tar.bz2
linux-3.10-6a6aa2b7e47c725b5256ff0f7462fe1247cabf5a.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86/amd-iommu: Fix rounding-bug in __unmap_single x86/amd-iommu: Work around S3 BIOS bug x86/amd-iommu: Set iommu configuration flags in enable-loop x86, setup: Fix earlyprintk=serial,0x3f8,115200 x86, setup: Fix earlyprintk=serial,ttyS0,115200
Diffstat (limited to 'include')
-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 10d33309e9a..570fddeb038 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