patch-2.4.21 linux-2.4.21/drivers/video/modedb.c

• Lines: 37
• Date: 2003-06-13 07:51:37.000000000 -0700
• Orig file: linux-2.4.20/drivers/video/modedb.c
• Orig date: 2001-12-21 09:41:55.000000000 -0800

diff -urN linux-2.4.20/drivers/video/modedb.c linux-2.4.21/drivers/video/modedb.c
@@ -16,6 +16,7 @@
 #include <linux/fb.h>
 #include <linux/console_struct.h>
 #include <linux/sched.h>
+#include <video/fbcon.h>
 
 
 #undef DEBUG
@@ -257,28 +258,6 @@
     }
 }
 
-static int PROC_CONSOLE(const struct fb_info *info)
-{
-	int fgc;
-	
-	if (info->display_fg != NULL)
-		fgc = info->display_fg->vc_num;
-	else
-		return -1;
-		
-	if (!current->tty)
-		return fgc;
-
-	if (current->tty->driver.type != TTY_DRIVER_TYPE_CONSOLE)
-		/* XXX Should report error here? */
-		return fgc;
-
-	if (MINOR(current->tty->device) < 1)
-		return fgc;
-
-	return MINOR(current->tty->device) - 1;
-}
-
 
 /**
  *	__fb_try_mode - test a video mode