From: Paul Mackerras <paulus@samba.org>
Date: Thu, 27 Oct 2005 12:21:37 +0000 (+1000)
Subject: powerpc: remove duplicate screen_info from setup_32.c
X-Git-Tag: v2.6.15-rc1~59^2~72
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eef69e3cfb38d83166dbd8bcb12ededa1b6e78b6;p=linux-2.6-omap-h63xx.git

powerpc: remove duplicate screen_info from setup_32.c

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 21ef643a020..150a919269a 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -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.