diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-04-13 16:12:25 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-04-28 18:20:29 -0600 |
| commit | cf32eb89cb4e674f88e4af5025839d85d02485c6 (patch) | |
| tree | 855f0526c3dda7df6086562181de842e9f40aedd | |
| parent | 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f (diff) | |
| download | op-kernel-dev-cf32eb89cb4e674f88e4af5025839d85d02485c6.zip op-kernel-dev-cf32eb89cb4e674f88e4af5025839d85d02485c6.tar.gz | |
of/flattree: make of_fdt.h safe to unconditionally include.
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>
| -rw-r--r-- | include/linux/of_fdt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index a1ca92c..f0fdd1f 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -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 */ |
