diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 14:18:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 14:18:40 -0500 |
| commit | 8c34482c17d8fd07966328c7b1cfc35ee290bd1c (patch) | |
| tree | 324f7535ae561dcc430764fd2c7531ff67d9780b /include/linux | |
| parent | 1a47f7a84ef386c1f7f55f669598bd9894ceb73a (diff) | |
| parent | d95defaca7994ffff1ceb52f3011eb644dfe3274 (diff) | |
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 'include/linux')
| -rw-r--r-- | include/linux/of_fdt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index 0ef22a1f129e..c84d900fbbb3 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h | |||
| @@ -97,7 +97,7 @@ extern void early_init_dt_check_for_initrd(unsigned long node); | |||
| 97 | extern int early_init_dt_scan_memory(unsigned long node, const char *uname, | 97 | extern int early_init_dt_scan_memory(unsigned long node, const char *uname, |
| 98 | int depth, void *data); | 98 | int depth, void *data); |
| 99 | extern void early_init_dt_add_memory_arch(u64 base, u64 size); | 99 | extern void early_init_dt_add_memory_arch(u64 base, u64 size); |
| 100 | extern u64 early_init_dt_alloc_memory_arch(u64 size, u64 align); | 100 | extern void * early_init_dt_alloc_memory_arch(u64 size, u64 align); |
| 101 | extern u64 dt_mem_next_cell(int s, __be32 **cellp); | 101 | extern u64 dt_mem_next_cell(int s, __be32 **cellp); |
| 102 | 102 | ||
| 103 | /* | 103 | /* |