diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-24 19:08:17 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-24 19:08:17 -0400 |
| commit | 03eb14199e8a2ff2bc170b283305990151b0d619 (patch) | |
| tree | c16c123a850e8033b2daa71ad9ae241906542dd8 /arch/mips/kernel | |
| parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
| parent | ede338f4ce2fb5ee99d18751df32fbd3b10df268 (diff) | |
Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel-stable
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/prom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index a19811e98a41..5b7eade41fa3 100644 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c | |||
| @@ -83,7 +83,8 @@ void __init early_init_devtree(void *params) | |||
| 83 | * device-tree, including the platform type, initrd location and | 83 | * device-tree, including the platform type, initrd location and |
| 84 | * size, and more ... | 84 | * size, and more ... |
| 85 | */ | 85 | */ |
| 86 | of_scan_flat_dt(early_init_dt_scan_chosen, NULL); | 86 | of_scan_flat_dt(early_init_dt_scan_chosen, arcs_cmdline); |
| 87 | |||
| 87 | 88 | ||
| 88 | /* Scan memory nodes */ | 89 | /* Scan memory nodes */ |
| 89 | of_scan_flat_dt(early_init_dt_scan_root, NULL); | 90 | of_scan_flat_dt(early_init_dt_scan_root, NULL); |