Merge branch 'for-2.6.23' into merge

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h
index 959124f3f9af..86077066cd7c 100644
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
@@ -19,6 +19,8 @@
 #define MAX_PATH_LEN            256
 #define MAX_PROP_LEN            256 /* What should this be? */
 
+typedef void (*kernel_entry_t)(unsigned long r3, unsigned long r4, void *r5);
+
 /* Platform specific operations */
 struct platform_ops {
         void    (*fixups)(void);
@@ -51,7 +53,7 @@ extern struct dt_ops dt_ops;
 /* Console operations */
 struct console_ops {
         int     (*open)(void);
-        void    (*write)(char *buf, int len);
+        void    (*write)(const char *buf, int len);
         void    (*edit_cmdline)(char *buf, int len);
         void    (*close)(void);
         void    *data;