Merge branch 'master'

[linux-2.6-block.git] / include / linux / init.h

diff --git a/include/linux/init.h b/include/linux/init.h
index ed0ac7c39fdc49bc83c9db2dc885d1ec63046873..93dcbe1abb4c83b65cc6af59fb84c3c5e16effbb 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -245,7 +245,8 @@ void __init parse_early_param(void);
 #define __cpuexitdata  __exitdata
 #endif
 
-#ifdef CONFIG_MEMORY_HOTPLUG
+#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \
+       || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
 #define __meminit
 #define __meminitdata
 #define __memexit