Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[karo-tx-linux.git] / include / asm-sh / setup.h

diff --git a/include/asm-sh/setup.h b/include/asm-sh/setup.h
index d19de7c8df4e258066a8911ddc9064467392c0c5..586a9711a75dbec4ef86557fef94a71cc26e03ee 100644 (file)
--- a/include/asm-sh/setup.h
+++ b/include/asm-sh/setup.h
@@ -1,8 +1,13 @@
-#ifdef __KERNEL__
 #ifndef _SH_SETUP_H
 #define _SH_SETUP_H
 
 #define COMMAND_LINE_SIZE 256
 
-#endif /* _SH_SETUP_H */
+#ifdef __KERNEL__
+
+int setup_early_printk(char *);
+void sh_mv_setup(void);
+
 #endif /* __KERNEL__ */
+
+#endif /* _SH_SETUP_H */