Cleanup console merge

Instead of checking for cetain architectures in the Makefile set
CONFIG_HW_CONSOLE in Config.in if we support a hardware console.

diff --git a/drivers/char/Config.in b/drivers/char/Config.in
index daa78d667ac701f95ef6da7229f6f7458e1a4651..895eb4132f20442ee7740663307e0b995c2250cf 100644 (file)
--- a/drivers/char/Config.in
+++ b/drivers/char/Config.in
@@ -8,6 +8,9 @@ bool 'Virtual terminal' CONFIG_VT
 if [ "$CONFIG_VT" = "y" ]; then
    bool '  Support for console on virtual terminal' CONFIG_VT_CONSOLE
 fi
+if [ "$CONFIG_VT" = "y" -a "$CONFIG_S390" != "y" -a "$CONFIG_UM" != "y" ]; then
+   define_bool CONFIG_HW_CONSOLE y
+fi
 bool 'Non-standard serial port support' CONFIG_SERIAL_NONSTANDARD
 if [ "$CONFIG_SERIAL_NONSTANDARD" = "y" ]; then
    tristate '  Computone IntelliPort Plus serial support' CONFIG_COMPUTONE

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index d1f1b05d4efa521e28510bf5b9260c2971e6d939..b54b42fa294b8c4df85dc3c7b1f7d7ca3f851726 100644 (file)
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -17,28 +17,8 @@ export-objs     :=   busmouse.o console.o keyboard.o sysrq.o \
                        sonypi.o tty_io.o tty_ioctl.o generic_serial.o rtc.o \
                        ip2main.o
 
-ifneq ($(ARCH),s390)
-       ifneq ($(ARCH),s390x)
-               ifneq ($(ARCH),um)
-                       KEYMAP   =defkeymap.o
-                       CONSOLE  =console.o
-               endif
-       endif
-endif
-
-ifdef CONFIG_Q40
-  SERIAL = serial.o
-endif
-
-ifeq ($(CONFIG_DECSTATION),y)
-  SERIAL   = decserial.o
-endif
-
-obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o
-#obj-$(CONFIG_SERIAL) += $(SERIAL) # Fix for decserial.o
-
-obj-$(CONFIG_VT) += keyboard.o $(KEYMAP)
-
+obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o selection.o keyboard.o
+obj-$(CONFIG_HW_CONSOLE) += console.o defkeymap.o
 obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
 obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
 obj-$(CONFIG_ROCKETPORT) += rocket.o

diff --git a/drivers/char/console.c b/drivers/char/console.c
index 8be011adf7b3b7e3727ca7cc4af8872349d9d60d..1569450280c5174d976d0d602a56ea74477a43d2 100644 (file)
--- a/drivers/char/console.c
+++ b/drivers/char/console.c
@@ -128,10 +128,6 @@ const struct consw *conswitchp;
 extern void vcs_make_devfs (unsigned int index, int unregister);
 extern void console_map_init(void);
 
-#ifndef MIN
-#define MIN(a,b)       ((a) < (b) ? (a) : (b))
-#endif
-
 static struct tty_struct *console_table[MAX_NR_CONSOLES];
 static struct termios *console_termios[MAX_NR_CONSOLES];
 static struct termios *console_termios_locked[MAX_NR_CONSOLES];
@@ -748,7 +744,7 @@ int vc_resize(unsigned int lines, unsigned int cols,
                video_size_row = sr;
                screenbuf_size = ss;
 
-               rlth = MIN(osr, sr);
+               rlth = min(osr, sr);
                rrem = sr - rlth;
                ol = origin;
                nl = (long) newscreens[currcons];
@@ -3028,9 +3024,7 @@ EXPORT_SYMBOL(video_scan_lines);
 EXPORT_SYMBOL(vc_resize);
 EXPORT_SYMBOL(fg_console);
 EXPORT_SYMBOL(console_blank_hook);
-#ifdef CONFIG_VT
 EXPORT_SYMBOL(vt_cons);
-#endif
 #ifndef VT_SINGLE_DRIVER
 EXPORT_SYMBOL(take_over_console);
 EXPORT_SYMBOL(give_up_console);