aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-01-24 16:20:18 -0500
committerSam Ravnborg <sam@ravnborg.org>2008-01-28 17:21:18 -0500
commit1a3fb6d481689d0482eacadcbe3205b49b423c11 (patch)
tree11ebd92f8f75b4a1459e6be536548e1d9212cea6 /include/asm-generic
parent3ff6eecca4e5c49a5d1dd8b58ea0e20102ce08f0 (diff)
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>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/vmlinux.lds.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index e0a56fb8f813..294853053707 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -29,8 +29,7 @@
29#define CPU_DISCARD(sec) *(.cpu##sec) 29#define CPU_DISCARD(sec) *(.cpu##sec)
30#endif 30#endif
31 31
32#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \ 32#if defined(CONFIG_MEMORY_HOTPLUG)
33 || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
34#define MEM_KEEP(sec) *(.mem##sec) 33#define MEM_KEEP(sec) *(.mem##sec)
35#define MEM_DISCARD(sec) 34#define MEM_DISCARD(sec)
36#else 35#else