diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-19 02:38:50 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-19 02:38:50 -0400 |
| commit | 97eb3f24352ec6632c2127b35d8087d2a809a9b9 (patch) | |
| tree | 722948059bbd325bbca232269490124231df80d4 /drivers/input/sparse-keymap.c | |
| parent | 439581ec07fa9cf3f519dd461a2cf41cfd3adcb4 (diff) | |
| parent | def179c271ac9b5020deca798470521f14d11edd (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/sparse-keymap.c')
| -rw-r--r-- | drivers/input/sparse-keymap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/sparse-keymap.c b/drivers/input/sparse-keymap.c index 7729e547ba65..337bf51bc984 100644 --- a/drivers/input/sparse-keymap.c +++ b/drivers/input/sparse-keymap.c | |||
| @@ -210,8 +210,8 @@ int sparse_keymap_setup(struct input_dev *dev, | |||
| 210 | 210 | ||
| 211 | dev->keycode = map; | 211 | dev->keycode = map; |
| 212 | dev->keycodemax = map_size; | 212 | dev->keycodemax = map_size; |
| 213 | dev->getkeycode_new = sparse_keymap_getkeycode; | 213 | dev->getkeycode = sparse_keymap_getkeycode; |
| 214 | dev->setkeycode_new = sparse_keymap_setkeycode; | 214 | dev->setkeycode = sparse_keymap_setkeycode; |
| 215 | 215 | ||
| 216 | return 0; | 216 | return 0; |
| 217 | 217 | ||