diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 22:18:40 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 22:18:40 +0300 |
| commit | 8c34482c17d8fd07966328c7b1cfc35ee290bd1c (patch) | |
| tree | 324f7535ae561dcc430764fd2c7531ff67d9780b /drivers/of/fdt.c | |
| parent | 1a47f7a84ef386c1f7f55f669598bd9894ceb73a (diff) | |
| parent | d95defaca7994ffff1ceb52f3011eb644dfe3274 (diff) | |
| download | linux-8c34482c17d8fd07966328c7b1cfc35ee290bd1c.tar.xz | |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
spi/spi_sh_msiof: fix a wrong free_irq() parameter
dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()
Diffstat (limited to 'drivers/of/fdt.c')
| -rw-r--r-- | drivers/of/fdt.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index c787c3d95c60..af824e7e0367 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -692,12 +692,6 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, return 1; } -static void *__init early_device_tree_alloc(u64 size, u64 align) -{ - unsigned long mem = early_init_dt_alloc_memory_arch(size, align); - return __va(mem); -} - /** * unflatten_device_tree - create tree of device_nodes from flat blob * @@ -709,7 +703,7 @@ static void *__init early_device_tree_alloc(u64 size, u64 align) void __init unflatten_device_tree(void) { __unflatten_device_tree(initial_boot_params, &allnodes, - early_device_tree_alloc); + early_init_dt_alloc_memory_arch); /* Get pointer to OF "/chosen" node for use everywhere */ of_chosen = of_find_node_by_path("/chosen"); |