Merge commit 'v2.6.38-rc4' into spi/next

[karo-tx-linux.git] / include / linux / of_fdt.h

diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index 0ef22a1f129e9f8b5d8cf95b451c70ce4cbd8d3f..c84d900fbbb3d93a194cf5c3dbb7ad06388bd631 100644 (file)
--- 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);
 extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
                                     int depth, void *data);
 extern void early_init_dt_add_memory_arch(u64 base, u64 size);
-extern u64 early_init_dt_alloc_memory_arch(u64 size, u64 align);
+extern void * early_init_dt_alloc_memory_arch(u64 size, u64 align);
 extern u64 dt_mem_next_cell(int s, __be32 **cellp);
 
 /*