diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-04-13 23:21:38 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-04-13 23:21:38 -0700 |
| commit | 56f3e1c0579cd06196d51ebd1ccad9298c5426b3 (patch) | |
| tree | cacccdde5f6fb5c9e734977306fb1b73ef33ea03 /include | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
| parent | 38101475f937c5dc0baf43a9e0c7613dbeb94d5a (diff) | |
| download | linux-56f3e1c0579cd06196d51ebd1ccad9298c5426b3.tar.gz linux-56f3e1c0579cd06196d51ebd1ccad9298c5426b3.tar.bz2 linux-56f3e1c0579cd06196d51ebd1ccad9298c5426b3.zip | |
Merge branch 'for-linus' into next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/input/matrix_keypad.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h index 3bd018baae20..c964cd7f436a 100644 --- a/include/linux/input/matrix_keypad.h +++ b/include/linux/input/matrix_keypad.h @@ -44,6 +44,7 @@ struct matrix_keymap_data { * @active_low: gpio polarity * @wakeup: controls whether the device should be set up as wakeup * source + * @no_autorepeat: disable key autorepeat * * This structure represents platform-specific data that use used by * matrix_keypad driver to perform proper initialization. @@ -64,6 +65,7 @@ struct matrix_keypad_platform_data { bool active_low; bool wakeup; + bool no_autorepeat; }; /** |