diff options
| author | Mark Brown | 2012-06-12 05:46:58 +0200 |
|---|---|---|
| committer | Mark Brown | 2012-06-12 05:46:58 +0200 |
| commit | 66e61060d7ad9fcf61475fb836fb5987db7a7ee0 (patch) | |
| tree | a0abe3fb2fa8858261dc41df9444c0e0ca85f1a6 /init/main.c | |
| parent | ASoC: wm8903: Move register default changes to I2C probe (diff) | |
| parent | mfd/ab8500: Move platform-data for ab8500-codec into mfd-driver (diff) | |
| download | kernel-qcow2-linux-66e61060d7ad9fcf61475fb836fb5987db7a7ee0.tar.gz kernel-qcow2-linux-66e61060d7ad9fcf61475fb836fb5987db7a7ee0.tar.xz kernel-qcow2-linux-66e61060d7ad9fcf61475fb836fb5987db7a7ee0.zip | |
Merge branch 'asoc-ab8500' into for-3.6
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/init/main.c b/init/main.c index 1ca6b32c4828..b5cc0a7c4708 100644 --- a/init/main.c +++ b/init/main.c @@ -508,7 +508,7 @@ asmlinkage void __init start_kernel(void) parse_early_param(); parse_args("Booting kernel", static_command_line, __start___param, __stop___param - __start___param, - 0, 0, &unknown_bootoption); + -1, -1, &unknown_bootoption); jump_label_init(); @@ -755,13 +755,8 @@ static void __init do_initcalls(void) { int level; - for (level = 0; level < ARRAY_SIZE(initcall_levels) - 1; level++) { - pr_info("initlevel:%d=%s, %d registered initcalls\n", - level, initcall_level_names[level], - (int) (initcall_levels[level+1] - - initcall_levels[level])); + for (level = 0; level < ARRAY_SIZE(initcall_levels) - 1; level++) do_initcall_level(level); - } } /* |