summaryrefslogtreecommitdiff
path: root/include/linux/init.h
diff options
context:
space:
mode:
authorRussell King <rmk+lkml@arm.linux.org.uk>2004-06-26 21:03:00 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-26 21:03:00 -0700
commit53d4b32b482da634f2c6fee04046330e2865643f (patch)
tree42d80664b72c18fd20ad6cf7353611f6ef7c7ab9 /include/linux/init.h
parent375f73f966bdab09071d512a84001787ea0152e1 (diff)
[PATCH] ARM COMMAND_LINE_SIZE build fix
Rework the declaration, sizing and memcpying of saved_command_line[] so that ARM doesn't need to implement unwelcome header file nestings. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/init.h')
-rw-r--r--include/linux/init.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/init.h b/include/linux/init.h
index 641657ebe067..64d7417c835e 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -3,7 +3,6 @@
#include <linux/config.h>
#include <linux/compiler.h>
-#include <asm/setup.h>
/* These macros are used to mark some functions or
* initialized data (doesn't apply to uninitialized data)
@@ -69,7 +68,7 @@ extern initcall_t __con_initcall_start, __con_initcall_end;
extern initcall_t __security_initcall_start, __security_initcall_end;
/* Defined in init/main.c */
-extern char saved_command_line[COMMAND_LINE_SIZE];
+extern char saved_command_line[];
#endif
#ifndef MODULE