diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-13 12:21:52 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-13 12:21:52 +1000 |
| commit | f500024d63ce62ac56161102429f6c083b049908 (patch) | |
| tree | ff4c7ed32fb37de39f79efd28c2a3b9ea7ae6ed0 /arch/powerpc/kernel/prom.c | |
| parent | 36013ffb82d0a6d5fb278c271ac8f06280e9f89a (diff) | |
| parent | 05a1e39120b59efe8a3032b5c4bb2c3b79c59f75 (diff) | |
Merge remote-tracking branch 'devicetree/devicetree/next'
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
| -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 5f5e6aed2b70..1d15e7c42866 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -687,7 +687,7 @@ void __init early_init_devtree(void *params) * device-tree, including the platform type, initrd location and * size, TCE reserve, and more ... */ - of_scan_flat_dt(early_init_dt_scan_chosen_ppc, NULL); + of_scan_flat_dt(early_init_dt_scan_chosen_ppc, cmd_line); /* Scan memory nodes and rebuild MEMBLOCKs */ memblock_init(); |