From bc05118f7de3b5d79004850f0347734634fa768f Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Thu, 27 Oct 2005 22:21:37 +1000
Subject: [PATCH] --- yaml --- r: 11677 b: refs/heads/master c:
 eef69e3cfb38d83166dbd8bcb12ededa1b6e78b6 h: refs/heads/master i:   11675:
 14e7dc1b2f2244a34b65fcaa5fb82d494bb18a4d v: v3

---
 [refs]                               |  2 +-
 trunk/arch/powerpc/kernel/setup_32.c | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 51d4f42d7920..06f6ae04562d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b24b01c6c0bab24e6a4c3e4a02d53b564f2d05c
+refs/heads/master: eef69e3cfb38d83166dbd8bcb12ededa1b6e78b6
diff --git a/trunk/arch/powerpc/kernel/setup_32.c b/trunk/arch/powerpc/kernel/setup_32.c
index 21ef643a0208..150a919269ae 100644
--- a/trunk/arch/powerpc/kernel/setup_32.c
+++ b/trunk/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.