diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2009-06-09 04:50:57 -0400 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-06-09 04:50:57 -0400 |
| commit | d2dd01de9924ae24afeba5aa5bc2e08287701df6 (patch) | |
| tree | 3021bf496579a48984666355b59df5e44b42dd32 /init/main.c | |
| parent | 367d04c4ec02dad34d80452e32e3370db7fb6fee (diff) | |
| parent | 62a6f465f6572e1f28765c583c12753bb3e23715 (diff) | |
Merge commit 'tip/core/iommu' into amd-iommu/fixes
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); |