x86: printk kernel version in WARN_ON and other dump_stack users

[linux-2.6] / arch / um / include / chan_kern.h

diff --git a/arch/um/include/chan_kern.h b/arch/um/include/chan_kern.h
index 2d9aa7ef4c27d5db7eb40a759848e9cc9a42129e..624b5100a3cd778e5d7293cda886e16bae5fc943 100644 (file)
--- a/arch/um/include/chan_kern.h
+++ b/arch/um/include/chan_kern.h
@@ -36,12 +36,11 @@ extern int write_chan(struct list_head *chans, const char *buf, int len,
                             int write_irq);
 extern int console_write_chan(struct list_head *chans, const char *buf, 
                              int len);
-extern int console_open_chan(struct line *line, struct console *co,
-                            const struct chan_opts *opts);
+extern int console_open_chan(struct line *line, struct console *co);
 extern void deactivate_chan(struct list_head *chans, int irq);
 extern void reactivate_chan(struct list_head *chans, int irq);
 extern void chan_enable_winch(struct list_head *chans, struct tty_struct *tty);
-extern void enable_chan(struct line *line);
+extern int enable_chan(struct line *line);
 extern void close_chan(struct list_head *chans, int delay_free_irq);
 extern int chan_window_size(struct list_head *chans, 
                             unsigned short *rows_out,