Merge branch 'fix/hda' into for-linus

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

diff --git a/arch/sparc/kernel/prom.h b/arch/sparc/kernel/prom.h
index dea8b91b6960f35e408f49b00ce6fa60f77153ad..bb0f0fda6cab4a4686cbb031a0864c45e3df346a 100644 (file)
--- a/arch/sparc/kernel/prom.h
+++ b/arch/sparc/kernel/prom.h
@@ -8,10 +8,7 @@ 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;
 
@@ -24,11 +21,9 @@ static inline int is_root_node(const struct device_node *dp)
 }
 
 extern char *build_path_component(struct device_node *dp);
+extern void of_console_init(void);
+extern void of_fill_in_cpu_data(void);
 
-extern struct device_node * __init prom_create_node(phandle node,
-                                                   struct device_node *parent);
+extern unsigned int prom_early_allocated;
 
-extern struct device_node * __init prom_build_tree(struct device_node *parent,
-                                                  phandle node,
-                                                  struct device_node ***nextp);
 #endif /* __PROM_H */