patch-2.4.4 linux/drivers/s390/char/hwc_con.c

• Lines: 38
• Date: Wed Apr 11 19:02:29 2001
• Orig file: v2.4.3/linux/drivers/s390/char/hwc_con.c
• Orig date: Tue Feb 13 14:13:44 2001

diff -u --recursive --new-file v2.4.3/linux/drivers/s390/char/hwc_con.c linux/drivers/s390/char/hwc_con.c
@@ -17,14 +17,13 @@
 #include <linux/fs.h>
 #include <linux/init.h>
 
+#include "ctrlchar.h"
 #include "hwc_rw.h"
 
-extern void hwc_tty_init (void);
-
 #ifdef CONFIG_HWC_CONSOLE
 
 #define  hwc_console_major 4
-#define  hwc_console_minor 0
+#define  hwc_console_minor 64
 #define  hwc_console_name  "console"
 
 void hwc_console_write (struct console *, const char *, unsigned int);
@@ -84,17 +83,16 @@
 hwc_console_init (void)
 {
 
-#ifdef CONFIG_3215
+#if defined(CONFIG_3215_CONSOLE) || defined(CONFIG_3270_CONSOLE)
 	if (MACHINE_IS_VM)
 		return;
 #endif
 	if (MACHINE_IS_P390)
 		return;
 
+	ctrlchar_init ();
+  
 	if (hwc_init () == 0) {
-
-		hwc_tty_init ();
-
 #ifdef CONFIG_HWC_CONSOLE
 
 		register_console (&hwc_console);