diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-14 21:58:33 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-14 21:58:33 +0100 |
| commit | 029af8c753bb5a7432aa1ed38bf61fe2c2f66d17 (patch) | |
| tree | 0eb94b06d2182950531aa2c833d2d8725be84dce /drivers/char | |
| parent | 75f224cf7700ed6006574dc3f2efa29860727570 (diff) | |
| parent | 5279585ff2bedc8180da5bdf8aa3ff1736466de2 (diff) | |
| download | kernel_samsung_smdk4412-029af8c753bb5a7432aa1ed38bf61fe2c2f66d17.zip kernel_samsung_smdk4412-029af8c753bb5a7432aa1ed38bf61fe2c2f66d17.tar.gz kernel_samsung_smdk4412-029af8c753bb5a7432aa1ed38bf61fe2c2f66d17.tar.bz2 | |
Merge branch 'linus' into perfcounters/core
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/cp437.uni | 12 | ||||
| -rw-r--r-- | drivers/char/vt.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/char/cp437.uni b/drivers/char/cp437.uni index 1f06889..bc61634 100644 --- a/drivers/char/cp437.uni +++ b/drivers/char/cp437.uni @@ -27,7 +27,7 @@ 0x0c U+2640 0x0d U+266a 0x0e U+266b -0x0f U+263c +0x0f U+263c U+00a4 0x10 U+25b6 U+25ba 0x11 U+25c0 U+25c4 0x12 U+2195 @@ -55,7 +55,7 @@ 0x24 U+0024 0x25 U+0025 0x26 U+0026 -0x27 U+0027 +0x27 U+0027 U+00b4 0x28 U+0028 0x29 U+0029 0x2a U+002a @@ -84,7 +84,7 @@ 0x41 U+0041 U+00c0 U+00c1 U+00c2 U+00c3 0x42 U+0042 0x43 U+0043 U+00a9 -0x44 U+0044 +0x44 U+0044 U+00d0 0x45 U+0045 U+00c8 U+00ca U+00cb 0x46 U+0046 0x47 U+0047 @@ -140,7 +140,7 @@ 0x79 U+0079 U+00fd 0x7a U+007a 0x7b U+007b -0x7c U+007c U+00a5 +0x7c U+007c U+00a6 0x7d U+007d 0x7e U+007e # @@ -263,10 +263,10 @@ 0xe8 U+03a6 U+00d8 0xe9 U+0398 0xea U+03a9 U+2126 -0xeb U+03b4 +0xeb U+03b4 U+00f0 0xec U+221e 0xed U+03c6 U+00f8 -0xee U+03b5 +0xee U+03b5 U+2208 0xef U+2229 0xf0 U+2261 0xf1 U+00b1 diff --git a/drivers/char/vt.c b/drivers/char/vt.c index a5af607..008176e 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 |