Merge branch 'master' into for-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 71e1a916d3fa9d6fbd6876a7aacc695711123a40..7bbf5b32843897a4b09c700a430221a6f6002897 100644 (file)
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -72,7 +72,7 @@ extern void *of_get_flat_dt_prop(unsigned long node, const char *name,
                                 unsigned long *size);
 extern int of_flat_dt_is_compatible(unsigned long node, const char *name);
 extern unsigned long of_get_flat_dt_root(void);
-extern void early_init_dt_scan_chosen_arch(unsigned long node);
+
 extern int early_init_dt_scan_chosen(unsigned long node, const char *uname,
                                     int depth, void *data);
 extern void early_init_dt_check_for_initrd(unsigned long node);