From: Adrian Bunk <bunk@kernel.org>

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

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/init.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff -puN include/linux/init.h~linux-inith-simplify-__meminitexit-dependencies include/linux/init.h
--- a/include/linux/init.h~linux-inith-simplify-__meminitexit-dependencies
+++ a/include/linux/init.h
@@ -279,8 +279,7 @@ void __init parse_early_param(void);
 #define __cpuexitdata	__exitdata
 #endif
 
-#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \
-	|| defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
+#if defined(CONFIG_MEMORY_HOTPLUG)
 #define __meminit
 #define __meminitdata
 #define __memexit
_