aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-27 08:21:37 -0400
committerPaul Mackerras <paulus@samba.org>2005-10-27 08:21:37 -0400
commiteef69e3cfb38d83166dbd8bcb12ededa1b6e78b6 (patch)
treed04f2df475430d9c25340b035c4d594b6e53b083
parent4b24b01c6c0bab24e6a4c3e4a02d53b564f2d05c (diff)
powerpc: remove duplicate screen_info from setup_32.c
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/kernel/setup_32.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 21ef643a0208..150a919269ae 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -94,21 +94,6 @@ int dcache_bsize;
94int icache_bsize; 94int icache_bsize;
95int ucache_bsize; 95int ucache_bsize;
96 96
97#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_FB_VGA16) || \
98 defined(CONFIG_FB_VGA16_MODULE) || defined(CONFIG_FB_VESA)
99struct screen_info screen_info = {
100 0, 25, /* orig-x, orig-y */
101 0, /* unused */
102 0, /* orig-video-page */
103 0, /* orig-video-mode */
104 80, /* orig-video-cols */
105 0,0,0, /* ega_ax, ega_bx, ega_cx */
106 25, /* orig-video-lines */
107 1, /* orig-video-isVGA */
108 16 /* orig-video-points */
109};
110#endif /* CONFIG_VGA_CONSOLE || CONFIG_FB_VGA16 || CONFIG_FB_VESA */
111
112/* 97/*
113 * We're called here very early in the boot. We determine the machine 98 * We're called here very early in the boot. We determine the machine
114 * type and call the appropriate low-level setup functions. 99 * type and call the appropriate low-level setup functions.