Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / arch / sparc / kernel / prom.h

diff --git a/arch/sparc/kernel/prom.h b/arch/sparc/kernel/prom.h
index d14b4ae4fc579c2216e72fe9cdba1b0be2ceb7a9..bb0f0fda6cab4a4686cbb031a0864c45e3df346a 100644 (file)
--- a/arch/sparc/kernel/prom.h
+++ b/arch/sparc/kernel/prom.h
@@ -8,14 +8,22 @@ extern struct device_node *allnodes;  /* temporary while merging */
 extern rwlock_t devtree_lock;  /* temporary while merging */
 
 extern void * prom_early_alloc(unsigned long size);
-
-#ifdef CONFIG_SPARC64
 extern void irq_trans_init(struct device_node *dp);
-#endif
 
 extern unsigned int prom_unique_id;
 
-extern struct device_node * __init create_node(phandle node,
-                                              struct device_node *parent);
+static inline int is_root_node(const struct device_node *dp)
+{
+       if (!dp)
+               return 0;
+
+       return (dp->parent == NULL);
+}
+
+extern char *build_path_component(struct device_node *dp);
+extern void of_console_init(void);
+extern void of_fill_in_cpu_data(void);
+
+extern unsigned int prom_early_allocated;
 
 #endif /* __PROM_H */