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/powerpc | |
| 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/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 48aeb55faae9..f2c906b1d8d3 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
| @@ -694,7 +694,7 @@ void __init early_init_devtree(void *params) | |||
| 694 | * device-tree, including the platform type, initrd location and | 694 | * device-tree, including the platform type, initrd location and |
| 695 | * size, TCE reserve, and more ... | 695 | * size, TCE reserve, and more ... |
| 696 | */ | 696 | */ |
| 697 | of_scan_flat_dt(early_init_dt_scan_chosen_ppc, NULL); | 697 | of_scan_flat_dt(early_init_dt_scan_chosen_ppc, cmd_line); |
| 698 | 698 | ||
| 699 | /* Scan memory nodes and rebuild MEMBLOCKs */ | 699 | /* Scan memory nodes and rebuild MEMBLOCKs */ |
| 700 | memblock_init(); | 700 | memblock_init(); |