summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Fleming <afleming@gmail.com>2016-03-16 23:15:44 -0500
committerJoerg Roedel <jroedel@suse.de>2016-04-07 14:45:59 +0200
commita0d284d2b1d9f7453ff1c5cc7854219daf4f7590 (patch)
treecddc22ef60b95af01692667677c095f6b2e58cc8
parent9735a22799b9214d17d3c231fe377fc852f042e9 (diff)
downloadlinux-a0d284d2b1d9f7453ff1c5cc7854219daf4f7590.tar.gz
linux-a0d284d2b1d9f7453ff1c5cc7854219daf4f7590.tar.bz2
linux-a0d284d2b1d9f7453ff1c5cc7854219daf4f7590.zip
powerpc: Fix incorrect PPC32 PAMU dependency
The Freescale PAMU can be enabled on both 32 and 64-bit Power chips. Commit 477ab7a19ce restricted PAMU to PPC32. PPC covers both. Signed-off-by: Andy Fleming <afleming@gmail.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r--drivers/iommu/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index dd1dc39f84ff..e0dfb8676d61 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -76,8 +76,7 @@ config IOMMU_DMA
config FSL_PAMU
bool "Freescale IOMMU support"
- depends on PPC32
- depends on PPC_E500MC || COMPILE_TEST
+ depends on PPC_E500MC || (COMPILE_TEST && PPC)
select IOMMU_API
select GENERIC_ALLOCATOR
help