From: Adrian Bunk <bunk@kernel.org>
Date: Thu, 24 Jan 2008 21:20:18 +0000 (+0100)
Subject: asm-generic/vmlix.lds.h: simplify __mem{init,exit}* dependencies
X-Git-Tag: v3.12-rc1~24055^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a3fb6d481689d0482eacadcbe3205b49b423c11;p=kernel%2Fkernel-generic.git

asm-generic/vmlix.lds.h: simplify __mem{init,exit}* dependencies

Simplify the dependencies on __mem{init,exit}* (ACPI_HOTPLUG_MEMORY requires
MEMORY_HOTPLUG).

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index e0a56fb..2948530 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -29,8 +29,7 @@
 #define CPU_DISCARD(sec) *(.cpu##sec)
 #endif
 
-#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \
-	|| defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
+#if defined(CONFIG_MEMORY_HOTPLUG)
 #define MEM_KEEP(sec)    *(.mem##sec)
 #define MEM_DISCARD(sec)
 #else