summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2015-01-26 13:22:25 +0100
committerJoerg Roedel <jroedel@suse.de>2015-01-26 13:22:25 +0100
commit16753322983bcca0eca6d81f20d23277df0d6cf7 (patch)
tree8064489ae62d2fc8ea344b6736f0b204e3187a3b /arch
parentLinux 3.19-rc6 (diff)
parentiommu/arm-smmu: add support for iova_to_phys through ATS1PR (diff)
downloadlinux-16753322983bcca0eca6d81f20d23277df0d6cf7.tar.xz
linux-16753322983bcca0eca6d81f20d23277df0d6cf7.zip
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index b1f9a20a3677..528c3fd2d4c1 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -349,7 +349,6 @@ config ARM64_VA_BITS_42
config ARM64_VA_BITS_48
bool "48-bit"
- depends on !ARM_SMMU
endchoice