]> err.no Git - linux-2.6/commitdiff
powerpc: remove duplicate screen_info from setup_32.c
authorPaul Mackerras <paulus@samba.org>
Thu, 27 Oct 2005 12:21:37 +0000 (22:21 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 27 Oct 2005 12:21:37 +0000 (22:21 +1000)
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/setup_32.c

index 21ef643a02083072121021faf6d0388093cfdac5..150a919269ae64a533c3b409b35220422f8072c4 100644 (file)
@@ -94,21 +94,6 @@ int dcache_bsize;
 int icache_bsize;
 int ucache_bsize;
 
-#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_FB_VGA16) || \
-    defined(CONFIG_FB_VGA16_MODULE) || defined(CONFIG_FB_VESA)
-struct screen_info screen_info = {
-       0, 25,                  /* orig-x, orig-y */
-       0,                      /* unused */
-       0,                      /* orig-video-page */
-       0,                      /* orig-video-mode */
-       80,                     /* orig-video-cols */
-       0,0,0,                  /* ega_ax, ega_bx, ega_cx */
-       25,                     /* orig-video-lines */
-       1,                      /* orig-video-isVGA */
-       16                      /* orig-video-points */
-};
-#endif /* CONFIG_VGA_CONSOLE || CONFIG_FB_VGA16 || CONFIG_FB_VESA */
-
 /*
  * We're called here very early in the boot.  We determine the machine
  * type and call the appropriate low-level setup functions.