diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2007-01-10 08:45:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-10 12:33:59 -0500 |
commit | 3eb3c740f51c2126b53c2dde974c1c57e634aa7b (patch) | |
tree | bbc9a1152685d8ed97f231e4ff161d01d58f0fe2 /init/main.c | |
parent | 8edf51a5ee38eb40de5449e131fd36450a229430 (diff) |
[PATCH] fix linux banner format string
Revert previous attempts at messing with the linux banner string and
simply use a separate format string for proc.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Acked-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Jean Delvare <khali@linux-fr.org>
Cc: Andrey Borzenkov <arvidjaar@mail.ru>
Cc: Andrew Morton <akpm@osdl.org>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/init/main.c b/init/main.c index bc27d72bbb19..d908d3e03344 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -50,9 +50,7 @@ | |||
50 | #include <linux/buffer_head.h> | 50 | #include <linux/buffer_head.h> |
51 | #include <linux/debug_locks.h> | 51 | #include <linux/debug_locks.h> |
52 | #include <linux/lockdep.h> | 52 | #include <linux/lockdep.h> |
53 | #include <linux/utsrelease.h> | ||
54 | #include <linux/pid_namespace.h> | 53 | #include <linux/pid_namespace.h> |
55 | #include <linux/compile.h> | ||
56 | #include <linux/device.h> | 54 | #include <linux/device.h> |
57 | 55 | ||
58 | #include <asm/io.h> | 56 | #include <asm/io.h> |
@@ -482,12 +480,6 @@ void __init __attribute__((weak)) smp_setup_processor_id(void) | |||
482 | { | 480 | { |
483 | } | 481 | } |
484 | 482 | ||
485 | static const char linux_banner[] = | ||
486 | "Linux version " UTS_RELEASE | ||
487 | " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")" | ||
488 | " (" LINUX_COMPILER ")" | ||
489 | " " UTS_VERSION "\n"; | ||
490 | |||
491 | asmlinkage void __init start_kernel(void) | 483 | asmlinkage void __init start_kernel(void) |
492 | { | 484 | { |
493 | char * command_line; | 485 | char * command_line; |