of/flattree: make of_fdt.h safe to unconditionally include.
authorGrant Likely <grant.likely@secretlab.ca>
Tue, 13 Apr 2010 23:12:25 +0000 (16:12 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 29 Apr 2010 00:20:29 +0000 (18:20 -0600)
If CONFIG_OF_FLATTREE is not set, then don't process the body of
linux/of_fdt.h

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
include/linux/of_fdt.h

index a1ca92c..f0fdd1f 100644 (file)
@@ -57,6 +57,7 @@ struct boot_param_header {
        __be32  dt_struct_size;         /* size of the DT structure block */
 };
 
+#if defined(CONFIG_OF_FLATTREE)
 /* TBD: Temporary export of fdt globals - remove when code fully merged */
 extern int __initdata dt_root_addr_cells;
 extern int __initdata dt_root_size_cells;
@@ -98,6 +99,7 @@ extern int early_init_dt_scan_root(unsigned long node, const char *uname,
 /* Other Prototypes */
 extern void unflatten_device_tree(void);
 extern void early_init_devtree(void *);
+#endif /* CONFIG_OF_FLATTREE */
 
 #endif /* __ASSEMBLY__ */
 #endif /* _LINUX_OF_FDT_H */