summaryrefslogtreecommitdiffstats
path: root/dmar-disable-when-ricoh-multifunction.patch
diff options
context:
space:
mode:
authorKyle McMartin <kmcmartin@redhat.com>2011-07-24 22:26:26 -0400
committerKyle McMartin <kmcmartin@redhat.com>2011-07-25 09:46:01 -0400
commit4a2041744e262bb41936adfb3db0b85e13c73b11 (patch)
tree13a97fd36359066adc33a220149246cecf9695de /dmar-disable-when-ricoh-multifunction.patch
parent524b8cb85593696e6867aa30b1c581cf35fb7cbe (diff)
downloadkernel-4a2041744e262bb41936adfb3db0b85e13c73b11.tar.gz
kernel-4a2041744e262bb41936adfb3db0b85e13c73b11.tar.xz
kernel-4a2041744e262bb41936adfb3db0b85e13c73b11.zip
3.0-git3 snapshot
Testing that this part of the spec still works... Hopefully the next release is indeed 3.1.0...
Diffstat (limited to 'dmar-disable-when-ricoh-multifunction.patch')
-rw-r--r--dmar-disable-when-ricoh-multifunction.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/dmar-disable-when-ricoh-multifunction.patch b/dmar-disable-when-ricoh-multifunction.patch
index 120730f9e..a4528617e 100644
--- a/dmar-disable-when-ricoh-multifunction.patch
+++ b/dmar-disable-when-ricoh-multifunction.patch
@@ -9,8 +9,8 @@ Subject: [PATCH] dmar: disable if ricoh multifunction detected
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 4789f8e..5923914 100644
---- a/drivers/pci/intel-iommu.c
-+++ b/drivers/pci/intel-iommu.c
+--- a/drivers/iommu/intel-iommu.c
++++ b/drivers/iommu/intel-iommu.c
@@ -3784,6 +3784,16 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0044, quirk_calpella_no_shadow_g
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0062, quirk_calpella_no_shadow_gtt);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x006a, quirk_calpella_no_shadow_gtt);