diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-21 22:16:05 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-21 22:16:05 +0000 |
| commit | 73ed328f3a698087551b4d6a36196b0819bc38af (patch) | |
| tree | d0907f2e7e5f36ea0808ed6b1f10c5caf51478a5 /drivers/char | |
| parent | 89a61cd744a621efff2a4d7f0d99258f850338f2 (diff) | |
Cleanup, sync with others sources.
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/Config.in | 4 | ||||
| -rw-r--r-- | drivers/char/console.c | 5 | ||||
| -rw-r--r-- | drivers/char/vt.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/drivers/char/Config.in b/drivers/char/Config.in index c6d225616..6c9f0a651 100644 --- a/drivers/char/Config.in +++ b/drivers/char/Config.in @@ -133,8 +133,8 @@ if [ "$CONFIG_VIDEO_DEV" != "n" ]; then dep_tristate 'BT848 Video For Linux' CONFIG_VIDEO_BT848 $CONFIG_VIDEO_DEV fi if [ "$CONFIG_PARPORT" != "n" ]; then - dep_tristate 'Quickcam BW Video For Linux' CONFIG_VIDEO_BWQCAM $CONFIG_VIDEO_DEV - dep_tristate 'Colour QuickCam Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_CQCAM $CONFIG_VIDEO_DEV + dep_tristate 'Quickcam BW Video For Linux' CONFIG_VIDEO_BWQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT + dep_tristate 'Colour QuickCam Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_CQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_SGI" = "y" ]; then diff --git a/drivers/char/console.c b/drivers/char/console.c index f04a00708..2005390d9 100644 --- a/drivers/char/console.c +++ b/drivers/char/console.c @@ -1044,7 +1044,7 @@ static void csi_m(int currcons) toggle_meta = 0; break; case 11: /* ANSI X3.64-1979 (SCO-ish?) - * Select first alternate font, let's + * Select first alternate font, lets * chars < 32 be displayed as ROM chars. */ translate = set_translate(IBMPC_MAP,currcons); @@ -2346,7 +2346,7 @@ __initfunc(unsigned long con_init(unsigned long kmem_start)) screenbuf = (unsigned short *) kmem_start; kmem_start += screenbuf_size; kmalloced = 0; - vc_init(currcons, video_num_lines, video_num_columns, + vc_init(currcons, video_num_lines, video_num_columns, currcons || !sw->con_save_screen); for (j=k=0; j<16; j++) { vc_cons[currcons].d->vc_palette[k++] = default_red[j] ; @@ -2354,7 +2354,6 @@ __initfunc(unsigned long con_init(unsigned long kmem_start)) vc_cons[currcons].d->vc_palette[k++] = default_blu[j] ; } } - currcons = fg_console = 0; master_display_fg = vc_cons[currcons].d; set_origin(currcons); diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 8b5fcc00c..b7f51e2f3 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -88,7 +88,7 @@ unsigned int video_scan_lines; * comments - KDMKTONE doesn't put the process to sleep. */ -#if defined(__i386__) || defined(__alpha__) || defined(__powerpc__) +#if defined(__i386__) || defined(__alpha__) || defined(__powerpc__) \ || (defined(__mips__) && !defined(CONFIG_SGI)) static void |