diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
| commit | 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 (patch) | |
| tree | 6c2da79366d4695a9c2560ab18259eca8a2a25b4 /drivers/char/keyboard.c | |
| parent | 92c49890922d54cba4b1eadeb0b185773c2c9570 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'drivers/char/keyboard.c')
| -rw-r--r-- | drivers/char/keyboard.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index d0369e05490a..7b3a212c86b1 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c | |||
| @@ -679,12 +679,7 @@ static void k_deadunicode(struct vc_data *vc, unsigned int value, char up_flag) | |||
| 679 | 679 | ||
| 680 | static void k_self(struct vc_data *vc, unsigned char value, char up_flag) | 680 | static void k_self(struct vc_data *vc, unsigned char value, char up_flag) |
| 681 | { | 681 | { |
| 682 | unsigned int uni; | 682 | k_unicode(vc, conv_8bit_to_uni(value), up_flag); |
| 683 | if (kbd->kbdmode == VC_UNICODE) | ||
| 684 | uni = value; | ||
| 685 | else | ||
| 686 | uni = conv_8bit_to_uni(value); | ||
| 687 | k_unicode(vc, uni, up_flag); | ||
| 688 | } | 683 | } |
| 689 | 684 | ||
| 690 | static void k_dead2(struct vc_data *vc, unsigned char value, char up_flag) | 685 | static void k_dead2(struct vc_data *vc, unsigned char value, char up_flag) |