diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 20:07:01 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 20:07:01 -0700 |
| commit | 41f880091c15b039ffcc8b3d831656b81517a6d3 (patch) | |
| tree | a9919151491356b6445ecd9c613a60f69d207927 /include | |
| parent | bbd33931a08362f78266a4016211a35947b91041 (diff) | |
of/flattree: Merge unflatten_device_tree
Merge common code between PowerPC and MicroBlaze
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Tested-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of.h | 3 | ||||
| -rw-r--r-- | include/linux/of_fdt.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index e7facd8fbce..bec215792c4 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -63,6 +63,9 @@ struct device_node { #endif }; +/* Pointer for first entry in chain of all nodes. */ +extern struct device_node *allnodes; + static inline int of_node_check_flag(struct device_node *n, unsigned long flag) { return test_bit(flag, &n->_flags); diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index ace9068e07e..81231e04e8f 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -69,10 +69,6 @@ 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 unsigned long unflatten_dt_node(unsigned long mem, unsigned long *p, - struct device_node *dad, - struct device_node ***allnextpp, - unsigned long fpsize); /* Other Prototypes */ extern void finish_device_tree(void); |