git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel...
[pandora-kernel.git]
/
arch
/
microblaze
/
kernel
/
prom.c
diff --git
a/arch/microblaze/kernel/prom.c
b/arch/microblaze/kernel/prom.c
index
00ee90f
..
b15cc21
100644
(file)
--- a/
arch/microblaze/kernel/prom.c
+++ b/
arch/microblaze/kernel/prom.c
@@
-130,7
+130,7
@@
void __init early_init_devtree(void *params)
* device-tree, including the platform type, initrd location and
* size, TCE reserve, and more ...
*/
* device-tree, including the platform type, initrd location and
* size, TCE reserve, and more ...
*/
- of_scan_flat_dt(early_init_dt_scan_chosen,
NULL
);
+ of_scan_flat_dt(early_init_dt_scan_chosen,
cmd_line
);
/* Scan memory nodes and rebuild MEMBLOCKs */
memblock_init();
/* Scan memory nodes and rebuild MEMBLOCKs */
memblock_init();