Merge remote-tracking branch 'wireless-next/master' into mac80211-next

[firefly-linux-kernel-4.4.55.git] / include / linux / of_fdt.h

diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index 0beaee9dac1f1480a51c36ade2004d8b3a69cbce..2b77058a73351dec2842e779d35d04dafaf4c5e1 100644 (file)
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -116,6 +116,7 @@ extern const void *of_flat_dt_match_machine(const void *default_match,
 extern void unflatten_device_tree(void);
 extern void unflatten_and_copy_device_tree(void);
 extern void early_init_devtree(void *);
+extern void early_get_first_memblock_info(void *, phys_addr_t *);
 #else /* CONFIG_OF_FLATTREE */
 static inline const char *of_flat_dt_get_machine_name(void) { return NULL; }
 static inline void unflatten_device_tree(void) {}