diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-14 11:51:33 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-14 11:51:33 -0400 |
| commit | 85a3685852d9ac7d92be9d824533c915a4597fa4 (patch) | |
| tree | b7c542e2061cf96c9f7ad500fa12567f9ff0b39f /drivers/hid/hid-debug.c | |
| parent | 92bac83dd79e60e65c475222e41a992a70434beb (diff) | |
| parent | 8b8a518ef16be2de27207991e32fc32b0475c767 (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.1 merge window.
Diffstat (limited to 'drivers/hid/hid-debug.c')
| -rw-r--r-- | drivers/hid/hid-debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index 8bf61d295ffd..1086800693b2 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c | |||
| @@ -814,7 +814,7 @@ static const char *keys[KEY_MAX + 1] = { | |||
| 814 | [KEY_DELETEFILE] = "DeleteFile", [KEY_XFER] = "X-fer", | 814 | [KEY_DELETEFILE] = "DeleteFile", [KEY_XFER] = "X-fer", |
| 815 | [KEY_PROG1] = "Prog1", [KEY_PROG2] = "Prog2", | 815 | [KEY_PROG1] = "Prog1", [KEY_PROG2] = "Prog2", |
| 816 | [KEY_WWW] = "WWW", [KEY_MSDOS] = "MSDOS", | 816 | [KEY_WWW] = "WWW", [KEY_MSDOS] = "MSDOS", |
| 817 | [KEY_COFFEE] = "Coffee", [KEY_DIRECTION] = "Direction", | 817 | [KEY_COFFEE] = "Coffee", [KEY_ROTATE_DISPLAY] = "RotateDisplay", |
| 818 | [KEY_CYCLEWINDOWS] = "CycleWindows", [KEY_MAIL] = "Mail", | 818 | [KEY_CYCLEWINDOWS] = "CycleWindows", [KEY_MAIL] = "Mail", |
| 819 | [KEY_BOOKMARKS] = "Bookmarks", [KEY_COMPUTER] = "Computer", | 819 | [KEY_BOOKMARKS] = "Bookmarks", [KEY_COMPUTER] = "Computer", |
| 820 | [KEY_BACK] = "Back", [KEY_FORWARD] = "Forward", | 820 | [KEY_BACK] = "Back", [KEY_FORWARD] = "Forward", |