summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-15 11:49:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-15 11:49:55 -0700
commit00eef7bd01c7598d195699983c5290d901df19ad (patch)
tree14ba0178fc2c5e807282132e689236965b889e91 /include/linux
parent250541fca717a5c9b0d3710e737b2ca32ebb6fbc (diff)
parent014f61504af276ba9d9544d8a7401d8f8526eb73 (diff)
downloadblackbird-op-linux-00eef7bd01c7598d195699983c5290d901df19ad.tar.gz
blackbird-op-linux-00eef7bd01c7598d195699983c5290d901df19ad.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wacom - switch mode upon system resume Revert "Input: wacom - merge out and in prox events" Input: matrix_keypad - allow platform to disable key autorepeat Input: ALPS - add signature for HP Pavilion dm3 laptops Input: i8042 - spelling fix Input: sparse-keymap - implement safer freeing of the keymap Input: update the status of the Multitouch X driver project Input: clarify the no-finger event in multitouch protocol Input: bcm5974 - retract efi-broken suspend_resume Input: sparse-keymap - free the right keymap on error
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/input/matrix_keypad.h2
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;
};
/**
OpenPOWER on IntegriCloud