asm-generic/vmlix.lds.h: simplify __mem{init,exit}* dependencies
authorAdrian Bunk <bunk@kernel.org>
Thu, 24 Jan 2008 21:20:18 +0000 (22:20 +0100)
committerSam Ravnborg <sam@ravnborg.org>
Mon, 28 Jan 2008 22:21:18 +0000 (23:21 +0100)
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>
include/asm-generic/vmlinux.lds.h

index e0a56fb8f813a94768c7f51ba06f9ee1565ab933..294853053707913170ecf168291144dd4e81df59 100644 (file)
@@ -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