[PATCH] ARM: Fix discontigmem

The merge of sparsemem broke ARM discontigmem.  Fix it.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 07ba77c19f6c9172771c91f697ad0d2217439fdc..bfcf4228036892a4aaab3ab31db6a7c8bb8b7e73 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -157,7 +157,7 @@ config ARCH_RPC
 config ARCH_SA1100
        bool "SA1100-based"
        select ISA
-       select DISCONTIGMEM
+       select ARCH_DISCONTIGMEM_ENABLE
 
 config ARCH_S3C2410
        bool "Samsung S3C2410"

diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig
index 45c930ccd064802ec3195e342ed57476db6ca43d..0793dcf54f2e51dd30be757962db1483824a1d9d 100644 (file)
--- a/arch/arm/mach-clps711x/Kconfig
+++ b/arch/arm/mach-clps711x/Kconfig
@@ -28,7 +28,7 @@ config ARCH_CLEP7312
 config ARCH_EDB7211
        bool "EDB7211"
        select ISA
-       select DISCONTIGMEM
+       select ARCH_DISCONTIGMEM_ENABLE
        help
          Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211
          evaluation board.