patch-1.3.46 linux/drivers/char/console.c

Next file: linux/drivers/char/lp.c
Previous file: linux/drivers/char/apm_bios.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.45/linux/drivers/char/console.c linux/drivers/char/console.c
@@ -93,6 +93,9 @@
 #include <linux/major.h>
 #include <linux/mm.h>
 #include <linux/ioport.h>
+#ifdef CONFIG_APM
+#include <linux/apm_bios.h>
+#endif
 
 #include <asm/io.h>
 #include <asm/system.h>
@@ -2076,6 +2079,11 @@
 {
 	int currcons;
 
+#ifdef CONFIG_APM
+	if (apm_display_blank())
+		return;
+#endif
+
 	if (console_blanked)
 		return;
 
@@ -2110,6 +2118,11 @@
 	int currcons;
 	int resetorg;
 	long offset;
+
+#ifdef CONFIG_APM
+	if (apm_display_unblank())
+		return;
+#endif
 
 	if (!console_blanked)
 		return;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this