diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 04:58:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 04:58:01 -0400 |
| commit | 4894e4aca82aca927d0404ce61f021f790de4b1e (patch) | |
| tree | bbe0d083829f5858295298f188d885367cf4b1f6 /init/main.c | |
| parent | 05e882f890038c702a4f15d385135d03cf74ad48 (diff) | |
| parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) | |
Merge commit 'v2.6.30' into next
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 3bbf93be744c..d721dad05dd7 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -566,8 +566,7 @@ asmlinkage void __init start_kernel(void) | |||
| 566 | tick_init(); | 566 | tick_init(); |
| 567 | boot_cpu_init(); | 567 | boot_cpu_init(); |
| 568 | page_address_init(); | 568 | page_address_init(); |
| 569 | printk(KERN_NOTICE); | 569 | printk(KERN_NOTICE "%s", linux_banner); |
| 570 | printk(linux_banner); | ||
| 571 | setup_arch(&command_line); | 570 | setup_arch(&command_line); |
| 572 | mm_init_owner(&init_mm, &init_task); | 571 | mm_init_owner(&init_mm, &init_task); |
| 573 | setup_command_line(command_line); | 572 | setup_command_line(command_line); |