diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-25 14:29:34 -0400 |
|---|---|---|
| committer | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-25 14:29:34 -0400 |
| commit | 3cd9e19ebc91593c9f076410d6f979be188f01a0 (patch) | |
| tree | 2a677720ffbfb05a3002c971f3cdb65a7076db49 | |
| parent | 8144f56bd1e49015f94b8da99b24c4d04643b66d (diff) | |
[PATCH] ARM: Fix discontigmem
The merge of sparsemem broke ARM discontigmem. Fix it.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-clps711x/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 07ba77c19f6c..bfcf42280368 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -157,7 +157,7 @@ config ARCH_RPC | |||
| 157 | config ARCH_SA1100 | 157 | config ARCH_SA1100 |
| 158 | bool "SA1100-based" | 158 | bool "SA1100-based" |
| 159 | select ISA | 159 | select ISA |
| 160 | select DISCONTIGMEM | 160 | select ARCH_DISCONTIGMEM_ENABLE |
| 161 | 161 | ||
| 162 | config ARCH_S3C2410 | 162 | config ARCH_S3C2410 |
| 163 | bool "Samsung S3C2410" | 163 | bool "Samsung S3C2410" |
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig index 45c930ccd064..0793dcf54f2e 100644 --- a/arch/arm/mach-clps711x/Kconfig +++ b/arch/arm/mach-clps711x/Kconfig | |||
| @@ -28,7 +28,7 @@ config ARCH_CLEP7312 | |||
| 28 | config ARCH_EDB7211 | 28 | config ARCH_EDB7211 |
| 29 | bool "EDB7211" | 29 | bool "EDB7211" |
| 30 | select ISA | 30 | select ISA |
| 31 | select DISCONTIGMEM | 31 | select ARCH_DISCONTIGMEM_ENABLE |
| 32 | help | 32 | help |
| 33 | Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211 | 33 | Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211 |
| 34 | evaluation board. | 34 | evaluation board. |