diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-10-22 10:32:40 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-10-22 10:32:40 +0400 |
| commit | 3bcec5f076688c58436a6c354f5b94eef16469da (patch) | |
| tree | 6e50e1c03d52bffbd17b16dd6b153a428f0b9e7c /drivers/iommu | |
| parent | bc5bd37ce48c66e9192ad2e7231e9678880f6f8e (diff) | |
| parent | 828c79087cec61eaf4c76bb32c222fbe35ac3930 (diff) | |
| download | linux-3bcec5f076688c58436a6c354f5b94eef16469da.tar.xz | |
Merge tag 'drm-intel-fixes-2013-10-21' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Just an lvds clock gating fix and a pte clearing hack for hsw to avoid
memory corruption when hibernating - something doesn't seem to switch off
properly, we're still investigating.
* tag 'drm-intel-fixes-2013-10-21' of git://people.freedesktop.org/~danvet/drm-intel: (96 commits)
drm/i915: Disable GGTT PTEs on GEN6+ suspend
drm/i915: Make PTE valid encoding optional
drm/i915: disable LVDS clock gating on CPT v2
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index fe302e33f72e..c880ebaf1553 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -52,7 +52,7 @@ config AMD_IOMMU select PCI_PRI select PCI_PASID select IOMMU_API - depends on X86_64 && PCI && ACPI && X86_IO_APIC + depends on X86_64 && PCI && ACPI ---help--- With this option you can enable support for AMD IOMMU hardware in your system. An IOMMU is a hardware component which provides |