Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[uclinux-h8/linux.git] / arch / arm / mm / Kconfig

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 9357ff5..96a7b6c 100644 (file)
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -662,6 +662,7 @@ config ARM_LPAE
        bool "Support for the Large Physical Address Extension"
        depends on MMU && CPU_32v7 && !CPU_32v6 && !CPU_32v5 && \
                !CPU_32v4 && !CPU_32v3
+       select PHYS_ADDR_T_64BIT
        help
          Say Y if you have an ARMv7 processor supporting the LPAE page
          table format and you would like to access memory beyond the
@@ -674,12 +675,6 @@ config ARM_PV_FIXUP
        def_bool y
        depends on ARM_LPAE && ARM_PATCH_PHYS_VIRT && ARCH_KEYSTONE
 
-config ARCH_PHYS_ADDR_T_64BIT
-       def_bool ARM_LPAE
-
-config ARCH_DMA_ADDR_T_64BIT
-       bool
-
 config ARM_THUMB
        bool "Support Thumb user binaries" if !CPU_THUMBONLY && EXPERT
        depends on CPU_THUMB_CAPABLE