X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fchar%2Fkeyboard.c;h=7b3a212c86b1ab21d5e3d783716ded2787f3729d;hb=5554b35933245e95710d709175e14c02cbc956a4;hp=7f7e798c13844f0a8c8e2630057566c9ed5a66cf;hpb=2c4aabcca847ac4c92aa5e960c3f6053e1051b62;p=linux-2.6

diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 7f7e798c13..7b3a212c86 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -46,6 +46,8 @@
 
 extern void ctrl_alt_del(void);
 
+#define to_handle_h(n) container_of(n, struct input_handle, h_node)
+
 /*
  * Exported functions/variables
  */
@@ -677,12 +679,7 @@ static void k_deadunicode(struct vc_data *vc, unsigned int value, char up_flag)
 
 static void k_self(struct vc_data *vc, unsigned char value, char up_flag)
 {
-	unsigned int uni;
-	if (kbd->kbdmode == VC_UNICODE)
-		uni = value;
-	else
-		uni = conv_8bit_to_uni(value);
-	k_unicode(vc, uni, up_flag);
+	k_unicode(vc, conv_8bit_to_uni(value), up_flag);
 }
 
 static void k_dead2(struct vc_data *vc, unsigned char value, char up_flag)