linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/linux/init.h b/include/linux/init.h
index 6667785..ff8d8b8 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_INIT_H
 #define _LINUX_INIT_H
 
+#include <linux/config.h>
 #include <linux/compiler.h>
 
 /* These macros are used to mark some functions or 
@@ -68,10 +69,6 @@ extern initcall_t __security_initcall_start[], __security_initcall_end[];
 
 /* Defined in init/main.c */
 extern char saved_command_line[];
-
-/* used by init/main.c */
-extern void setup_arch(char **);
-
 #endif
   
 #ifndef MODULE
@@ -244,8 +241,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)
+#ifdef CONFIG_MEMORY_HOTPLUG
 #define __meminit
 #define __meminitdata
 #define __memexit