diff --git a/[refs] b/[refs] index 6546310fb779..e604eadafe33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05efde9d04ccc1d66a9d2225527c6ee638baa385 +refs/heads/master: 3c4279750c7d3f88a0638a44e257d7d8d10732f2 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index a36b5a8b123e..dc70660fe6bd 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -46,10 +46,6 @@ config GENERIC_CLOCKEVENTS_BROADCAST depends on GENERIC_CLOCKEVENTS default y if SMP && !LOCAL_TIMERS -config MMU - bool - default y - config NO_IOPORT bool @@ -188,6 +184,13 @@ source "kernel/Kconfig.freezer" menu "System Type" +config MMU + bool "MMU-based Paged Memory Management Support" + default y + help + Select if you want MMU-based virtualised addressing space + support by paged memory management. If unsure, say 'Y'. + choice prompt "ARM system type" default ARCH_VERSATILE