Pull dock-bay into release branch

[linux-2.6] / include / asm-sparc / prom.h

diff --git a/include/asm-sparc/prom.h b/include/asm-sparc/prom.h
index c7d54958a90eddde61cb65edf1396f189942b06f..350676c589f9d05c6bb659334441b2335f391908 100644 (file)
--- a/include/asm-sparc/prom.h
+++ b/include/asm-sparc/prom.h
@@ -25,6 +25,7 @@
 
 #define of_compat_cmp(s1, s2, l)       strncmp((s1), (s2), (l))
 #define of_prop_cmp(s1, s2)            strcasecmp((s1), (s2))
+#define of_node_cmp(s1, s2)            strcmp((s1), (s2))
 
 typedef u32 phandle;
 typedef u32 ihandle;
@@ -84,5 +85,9 @@ static inline void of_node_put(struct device_node *node)
  */
 #include <linux/of.h>
 
+extern struct device_node *of_console_device;
+extern char *of_console_path;
+extern char *of_console_options;
+
 #endif /* __KERNEL__ */
 #endif /* _SPARC_PROM_H */