[PATCH] ARM: Fix discontigmem

The merge of sparsemem broke ARM discontigmem. Fix it. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

[PATCH] ARM: Fix discontigmem
The merge of sparsemem broke ARM discontigmem. Fix it. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
3cd9e19e · Russell King · 8144f56b · 3cd9e19e · 3cd9e19e
Commit 3cd9e19e authored Jun 25, 2005 by Russell King
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

arch/arm/Kconfig arch/arm/Kconfig +1 -1

arch/arm/mach-clps711x/Kconfig arch/arm/mach-clps711x/Kconfig +1 -1

No files found.
--- 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"

--- 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.