lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel-stable

Browse Source
This commit is contained in:
Russell King
2011-05-25 00:08:17 +01:00
parent d762f43831 ede338f4ce
commit 03eb14199e
17 changed files with 375 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/microblaze/kernel/prom.c
View File

@ -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 ...
*/
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();