diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /drivers/video | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Config.in | 2 | ||||
| -rw-r--r-- | drivers/video/fbcon.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/Config.in b/drivers/video/Config.in index 20f3746fd..f3cb63093 100644 --- a/drivers/video/Config.in +++ b/drivers/video/Config.in @@ -53,7 +53,7 @@ if [ "$CONFIG_FB" = "y" ]; then if [ "$ARCH" = "i386" -o "$ARCH" = "alpha" -o "$ARCH" = "ppc" -o \ "$CONFIG_ARM" = "y" ]; then if [ "$CONFIG_ARM" != "y" -o "$CONFIG_ARCH_ACORN" != "y" ] ; then - tristate 'VGA chipset support (text only)' CONFIG_FB_VGA + tristate 'Deprecated almost-VGA support (text only - use normal VGA console instead)' CONFIG_FB_VGA fi fi if [ "$ARCH" = "alpha" ]; then diff --git a/drivers/video/fbcon.c b/drivers/video/fbcon.c index cdec5a29d..c2b7abd51 100644 --- a/drivers/video/fbcon.c +++ b/drivers/video/fbcon.c @@ -399,7 +399,7 @@ static void fbcon_setup(int con, int init, int logo) int old_rows, old_cols; unsigned short *save = NULL, *r, *q; /* Only if not module */ - extern int initmem_freed; + int initmem_freed = 1; struct fbcon_font_desc *font; if (con != fg_console || initmem_freed || p->type == FB_TYPE_TEXT) logo = 0; |