diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-06-22 09:26:29 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-06-22 09:26:29 -0700 |
| commit | f7ebc4dcdeb1be7209d94a8c0dc602ab24e36ae1 (patch) | |
| tree | 650c1748df35728e2bce1b8c26c064bfea272f63 /drivers/input/keyboard/samsung-keypad.c | |
| parent | 469d7d22cea146e40efe8c330e5164b4d8f13934 (diff) | |
| parent | 84c88ef9affb34f10cb5b66b07e2d496845d1c28 (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.2 merge window.
Diffstat (limited to 'drivers/input/keyboard/samsung-keypad.c')
| -rw-r--r-- | drivers/input/keyboard/samsung-keypad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c index 6b9fdf6cf8e8..43e48dac7687 100644 --- a/drivers/input/keyboard/samsung-keypad.c +++ b/drivers/input/keyboard/samsung-keypad.c @@ -585,7 +585,7 @@ static const struct of_device_id samsung_keypad_dt_match[] = { MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match); #endif -static struct platform_device_id samsung_keypad_driver_ids[] = { +static const struct platform_device_id samsung_keypad_driver_ids[] = { { .name = "samsung-keypad", .driver_data = KEYPAD_TYPE_SAMSUNG, |