diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 12:24:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 12:24:30 +0100 |
| commit | 3c68b4a8071fb11d905570d9b0e23034adc6c2bb (patch) | |
| tree | 3c644d508b67f9de2845b1e84f249f150e695c23 /drivers/char/vt.c | |
| parent | Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096 (diff) | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer... (diff) | |
| download | linux-3c68b4a8071fb11d905570d9b0e23034adc6c2bb.tar.xz linux-3c68b4a8071fb11d905570d9b0e23034adc6c2bb.zip | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'drivers/char/vt.c')
| -rw-r--r-- | drivers/char/vt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index a5af6072e2b3..008176edbd64 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -2274,7 +2274,7 @@ rescan_last_byte: continue; /* nothing to display */ } /* Glyph not found */ - if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) { + if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) { /* In legacy mode use the glyph we get by a 1:1 mapping. This would make absolutely no sense with Unicode in mind, but do this for ASCII characters since a font may lack |