From 7dd0b64ea5ef7f47cda17be54a5928449a145e6f Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Sun, 14 Feb 2010 07:13:38 -0700 Subject: [PATCH] --- yaml --- r: 180942 b: refs/heads/master c: 21b082ecdd7e6b8a5eba2cc013cae41b24de7f51 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/of.h | 8 ++++++++ trunk/include/linux/of_fdt.h | 10 ---------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index ae1bb574eda6..1ccfda8c898c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04b954a673dd02f585a2769c4945a43880faa989 +refs/heads/master: 21b082ecdd7e6b8a5eba2cc013cae41b24de7f51 diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h index fa5571b6e219..5c7b6a64acd9 100644 --- a/trunk/include/linux/of.h +++ b/trunk/include/linux/of.h @@ -180,6 +180,14 @@ extern int of_parse_phandles_with_args(struct device_node *np, const char *list_name, const char *cells_name, int index, struct device_node **out_node, const void **out_args); +extern int of_machine_is_compatible(const char *compat); + +extern int prom_add_property(struct device_node* np, struct property* prop); +extern int prom_remove_property(struct device_node *np, struct property *prop); +extern int prom_update_property(struct device_node *np, + struct property *newprop, + struct property *oldprop); + #if defined(CONFIG_OF_DYNAMIC) /* For updating the device tree at runtime */ extern void of_attach_node(struct device_node *); diff --git a/trunk/include/linux/of_fdt.h b/trunk/include/linux/of_fdt.h index 0007187ab59b..c9cb8a7bc065 100644 --- a/trunk/include/linux/of_fdt.h +++ b/trunk/include/linux/of_fdt.h @@ -95,18 +95,8 @@ extern int early_init_dt_scan_root(unsigned long node, const char *uname, int depth, void *data); /* Other Prototypes */ -extern void finish_device_tree(void); extern void unflatten_device_tree(void); extern void early_init_devtree(void *); -extern int of_machine_is_compatible(const char *compat); -extern void print_properties(struct device_node *node); -extern int prom_n_intr_cells(struct device_node* np); -extern void prom_get_irq_senses(unsigned char *senses, int off, int max); -extern int prom_add_property(struct device_node* np, struct property* prop); -extern int prom_remove_property(struct device_node *np, struct property *prop); -extern int prom_update_property(struct device_node *np, - struct property *newprop, - struct property *oldprop); #endif /* __ASSEMBLY__ */ #endif /* _LINUX_OF_FDT_H */