diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-04-14 02:21:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-04-14 02:21:38 -0400 |
| commit | 56f3e1c0579cd06196d51ebd1ccad9298c5426b3 (patch) | |
| tree | cacccdde5f6fb5c9e734977306fb1b73ef33ea03 /drivers/input/keyboard | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
| parent | 38101475f937c5dc0baf43a9e0c7613dbeb94d5a (diff) | |
Merge branch 'for-linus' into next
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/matrix_keypad.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c index ffc25cfcef7a..b443e088fd3c 100644 --- a/drivers/input/keyboard/matrix_keypad.c +++ b/drivers/input/keyboard/matrix_keypad.c | |||
| @@ -374,7 +374,9 @@ static int __devinit matrix_keypad_probe(struct platform_device *pdev) | |||
| 374 | input_dev->name = pdev->name; | 374 | input_dev->name = pdev->name; |
| 375 | input_dev->id.bustype = BUS_HOST; | 375 | input_dev->id.bustype = BUS_HOST; |
| 376 | input_dev->dev.parent = &pdev->dev; | 376 | input_dev->dev.parent = &pdev->dev; |
| 377 | input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP); | 377 | input_dev->evbit[0] = BIT_MASK(EV_KEY); |
| 378 | if (!pdata->no_autorepeat) | ||
| 379 | input_dev->evbit[0] |= BIT_MASK(EV_REP); | ||
| 378 | input_dev->open = matrix_keypad_start; | 380 | input_dev->open = matrix_keypad_start; |
| 379 | input_dev->close = matrix_keypad_stop; | 381 | input_dev->close = matrix_keypad_stop; |
| 380 | 382 | ||