diff options
-rw-r--r-- | drivers/char/keyboard.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/atkbd.c | 8 | ||||
-rw-r--r-- | drivers/macintosh/adbhid.c | 2 | ||||
-rw-r--r-- | drivers/usb/input/hid-debug.h | 2 | ||||
-rw-r--r-- | include/linux/input.h | 3 |
5 files changed, 9 insertions, 8 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 1b63acfc6c78..d82368bc46d0 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c | |||
@@ -1074,7 +1074,7 @@ static int emulate_raw(struct vc_data *vc, unsigned int keycode, | |||
1074 | put_queue(vc, 0x1d | up_flag); | 1074 | put_queue(vc, 0x1d | up_flag); |
1075 | put_queue(vc, 0x45 | up_flag); | 1075 | put_queue(vc, 0x45 | up_flag); |
1076 | return 0; | 1076 | return 0; |
1077 | case KEY_HANGUEL: | 1077 | case KEY_HANGEUL: |
1078 | if (!up_flag) put_queue(vc, 0xf1); | 1078 | if (!up_flag) put_queue(vc, 0xf1); |
1079 | return 0; | 1079 | return 0; |
1080 | case KEY_HANJA: | 1080 | case KEY_HANJA: |
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index 0eb955ddc654..1bf61f00cbd2 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c | |||
@@ -150,7 +150,7 @@ static unsigned char atkbd_unxlate_table[128] = { | |||
150 | #define ATKBD_RET_EMUL0 0xe0 | 150 | #define ATKBD_RET_EMUL0 0xe0 |
151 | #define ATKBD_RET_EMUL1 0xe1 | 151 | #define ATKBD_RET_EMUL1 0xe1 |
152 | #define ATKBD_RET_RELEASE 0xf0 | 152 | #define ATKBD_RET_RELEASE 0xf0 |
153 | #define ATKBD_RET_HANGUEL 0xf1 | 153 | #define ATKBD_RET_HANGEUL 0xf1 |
154 | #define ATKBD_RET_HANJA 0xf2 | 154 | #define ATKBD_RET_HANJA 0xf2 |
155 | #define ATKBD_RET_ERR 0xff | 155 | #define ATKBD_RET_ERR 0xff |
156 | 156 | ||
@@ -304,7 +304,7 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data, | |||
304 | 304 | ||
305 | if (atkbd->emul || | 305 | if (atkbd->emul || |
306 | (code != ATKBD_RET_EMUL0 && code != ATKBD_RET_EMUL1 && | 306 | (code != ATKBD_RET_EMUL0 && code != ATKBD_RET_EMUL1 && |
307 | code != ATKBD_RET_HANGUEL && code != ATKBD_RET_HANJA && | 307 | code != ATKBD_RET_HANGEUL && code != ATKBD_RET_HANJA && |
308 | (code != ATKBD_RET_ERR || atkbd->err_xl) && | 308 | (code != ATKBD_RET_ERR || atkbd->err_xl) && |
309 | (code != ATKBD_RET_BAT || atkbd->bat_xl))) { | 309 | (code != ATKBD_RET_BAT || atkbd->bat_xl))) { |
310 | atkbd->release = code >> 7; | 310 | atkbd->release = code >> 7; |
@@ -333,8 +333,8 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data, | |||
333 | case ATKBD_RET_RELEASE: | 333 | case ATKBD_RET_RELEASE: |
334 | atkbd->release = 1; | 334 | atkbd->release = 1; |
335 | goto out; | 335 | goto out; |
336 | case ATKBD_RET_HANGUEL: | 336 | case ATKBD_RET_HANGEUL: |
337 | atkbd_report_key(atkbd->dev, regs, KEY_HANGUEL, 3); | 337 | atkbd_report_key(atkbd->dev, regs, KEY_HANGEUL, 3); |
338 | goto out; | 338 | goto out; |
339 | case ATKBD_RET_HANJA: | 339 | case ATKBD_RET_HANJA: |
340 | atkbd_report_key(atkbd->dev, regs, KEY_HANJA, 3); | 340 | atkbd_report_key(atkbd->dev, regs, KEY_HANJA, 3); |
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index c26e1236b275..cbfbbe2b150a 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c | |||
@@ -179,7 +179,7 @@ u8 adb_to_linux_keycodes[128] = { | |||
179 | /* 0x65 */ KEY_F9, /* 67 */ | 179 | /* 0x65 */ KEY_F9, /* 67 */ |
180 | /* 0x66 */ KEY_HANJA, /* 123 */ | 180 | /* 0x66 */ KEY_HANJA, /* 123 */ |
181 | /* 0x67 */ KEY_F11, /* 87 */ | 181 | /* 0x67 */ KEY_F11, /* 87 */ |
182 | /* 0x68 */ KEY_HANGUEL, /* 122 */ | 182 | /* 0x68 */ KEY_HANGEUL, /* 122 */ |
183 | /* 0x69 */ KEY_SYSRQ, /* 99 */ | 183 | /* 0x69 */ KEY_SYSRQ, /* 99 */ |
184 | /* 0x6a */ 0, | 184 | /* 0x6a */ 0, |
185 | /* 0x6b */ KEY_SCROLLLOCK, /* 70 */ | 185 | /* 0x6b */ KEY_SCROLLLOCK, /* 70 */ |
diff --git a/drivers/usb/input/hid-debug.h b/drivers/usb/input/hid-debug.h index 702c48c2f81b..f04d6d75c098 100644 --- a/drivers/usb/input/hid-debug.h +++ b/drivers/usb/input/hid-debug.h | |||
@@ -563,7 +563,7 @@ static char *keys[KEY_MAX + 1] = { | |||
563 | [KEY_VOLUMEUP] = "VolumeUp", [KEY_POWER] = "Power", | 563 | [KEY_VOLUMEUP] = "VolumeUp", [KEY_POWER] = "Power", |
564 | [KEY_KPEQUAL] = "KPEqual", [KEY_KPPLUSMINUS] = "KPPlusMinus", | 564 | [KEY_KPEQUAL] = "KPEqual", [KEY_KPPLUSMINUS] = "KPPlusMinus", |
565 | [KEY_PAUSE] = "Pause", [KEY_KPCOMMA] = "KPComma", | 565 | [KEY_PAUSE] = "Pause", [KEY_KPCOMMA] = "KPComma", |
566 | [KEY_HANGUEL] = "Hanguel", [KEY_HANJA] = "Hanja", | 566 | [KEY_HANGUEL] = "Hangeul", [KEY_HANJA] = "Hanja", |
567 | [KEY_YEN] = "Yen", [KEY_LEFTMETA] = "LeftMeta", | 567 | [KEY_YEN] = "Yen", [KEY_LEFTMETA] = "LeftMeta", |
568 | [KEY_RIGHTMETA] = "RightMeta", [KEY_COMPOSE] = "Compose", | 568 | [KEY_RIGHTMETA] = "RightMeta", [KEY_COMPOSE] = "Compose", |
569 | [KEY_STOP] = "Stop", [KEY_AGAIN] = "Again", | 569 | [KEY_STOP] = "Stop", [KEY_AGAIN] = "Again", |
diff --git a/include/linux/input.h b/include/linux/input.h index 8d2b874d9e72..56f1e0e1e598 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
@@ -232,7 +232,8 @@ struct input_absinfo { | |||
232 | #define KEY_PAUSE 119 | 232 | #define KEY_PAUSE 119 |
233 | 233 | ||
234 | #define KEY_KPCOMMA 121 | 234 | #define KEY_KPCOMMA 121 |
235 | #define KEY_HANGUEL 122 | 235 | #define KEY_HANGEUL 122 |
236 | #define KEY_HANGUEL KEY_HANGEUL | ||
236 | #define KEY_HANJA 123 | 237 | #define KEY_HANJA 123 |
237 | #define KEY_YEN 124 | 238 | #define KEY_YEN 124 |
238 | #define KEY_LEFTMETA 125 | 239 | #define KEY_LEFTMETA 125 |