Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos',…

… 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next Conflicts: drivers/iommu/amd_iommu_init.c
mariux64 · Oct 2, 2012 · 0094872 · 0094872
6 parents 759643c + e6bc593 + f8ffcc9 + 500c25e + 2e12bc2 + 44229b1
commit 0094872
Show file tree

Hide file tree

Showing 11 changed files with 1,071 additions and 107 deletions.
diff --git a/arch/arm/mach-tegra/include/mach/smmu.h b/arch/arm/mach-tegra/include/mach/smmu.h
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
@@ -42,7 +42,7 @@ config AMD_IOMMU
 	select PCI_PRI
 	select PCI_PASID
 	select IOMMU_API
-	depends on X86_64 && PCI && ACPI
+	depends on X86_64 && PCI && ACPI && X86_IO_APIC
 	---help---
 	  With this option you can enable support for AMD IOMMU hardware in
 	  your system. An IOMMU is a hardware component which provides