diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-27 22:21:37 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-27 22:21:37 +1000 |
| commit | eef69e3cfb38d83166dbd8bcb12ededa1b6e78b6 (patch) | |
| tree | d04f2df475430d9c25340b035c4d594b6e53b083 /arch/powerpc | |
| parent | 4b24b01c6c0bab24e6a4c3e4a02d53b564f2d05c (diff) | |
| download | linux-0-day-eef69e3cfb38d83166dbd8bcb12ededa1b6e78b6.tar.gz linux-0-day-eef69e3cfb38d83166dbd8bcb12ededa1b6e78b6.tar.xz | |
powerpc: remove duplicate screen_info from setup_32.c
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/setup_32.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 21ef643a02083..150a919269ae6 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. |