Commit 0ef8ced2 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 63206b3b 25714ddf
...@@ -596,9 +596,15 @@ static int init(void * unused) ...@@ -596,9 +596,15 @@ static int init(void * unused)
do_pre_smp_initcalls(); do_pre_smp_initcalls();
smp_init(); smp_init();
do_basic_setup();
/*
* Do this before initcalls, because some drivers want to access
* firmware files.
*/
populate_rootfs(); populate_rootfs();
do_basic_setup();
/* /*
* check if there is an early userspace init. If yes, let it do all * check if there is an early userspace init. If yes, let it do all
* the work * the work
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment