Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / atakbd.c

diff --git a/drivers/input/keyboard/atakbd.c b/drivers/input/keyboard/atakbd.c
index 10bcd4ae54023a39bf7030546e1349780bef8ec5..f1235831283d74e81c18496ea8e90fd6115c3e2a 100644 (file)
--- a/drivers/input/keyboard/atakbd.c
+++ b/drivers/input/keyboard/atakbd.c
@@ -170,7 +170,7 @@ static unsigned char atakbd_keycode[0x72] = {       /* American layout */
        [93]     = KEY_KPASTERISK,
        [94]     = KEY_KPPLUS,
        [95]     = KEY_HELP,
-       [96]     = KEY_BACKSLASH,       /* FIXME: '<' */
+       [96]     = KEY_102ND,
        [97]     = KEY_KPASTERISK,      /* FIXME */
        [98]     = KEY_KPSLASH,
        [99]     = KEY_KPLEFTPAREN,