Commit 3cd9e19e authored by Russell King's avatar Russell King
Browse files

[PATCH] ARM: Fix discontigmem 



The merge of sparsemem broke ARM discontigmem.  Fix it.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8144f56b

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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"

arch/arm/mach-clps711x/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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.