diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 17:51:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 17:51:57 -0500 |
| commit | 3b3ef30833cc85982b0b7e950998d86f5e2d28cf (patch) | |
| tree | 0abbb1ec81a14f0f718abc01ac908bbe783f7bf9 /arch/arm | |
| parent | 9fc819172aa565c7be51f758b7e85301c9df7c70 (diff) | |
| parent | c332e9fcc5289698350d39d4d22c3ed5257d7a80 (diff) | |
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: sentelic - fix left/right horizontal scroll mapping
Input: pmouse - move Sentelic probe down the list
Input: add compat support for sysfs and /proc capabilities output
Input: i8042 - add Dritek quirk for Acer Aspire 5610.
Input: xbox - do not use GFP_KERNEL under spinlock
Input: psmouse - fix Synaptics detection when protocol is disabled
Input: bcm5974 - report ABS_MT events
Input: davinci_keyscan - add device_enable method to platform data
Input: evdev - be less aggressive about sending SIGIO notifies
Input: atkbd - fix canceling event_work in disconnect
Input: serio - fix potential deadlock when unbinding drivers
Input: gf2k - fix &&/|| confusion in gf2k_connect()
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/keyscan.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/include/mach/keyscan.h b/arch/arm/mach-davinci/include/mach/keyscan.h index b4e21a2976d1..7a560e05bda8 100644 --- a/arch/arm/mach-davinci/include/mach/keyscan.h +++ b/arch/arm/mach-davinci/include/mach/keyscan.h | |||
| @@ -29,6 +29,7 @@ enum davinci_matrix_types { | |||
| 29 | }; | 29 | }; |
| 30 | 30 | ||
| 31 | struct davinci_ks_platform_data { | 31 | struct davinci_ks_platform_data { |
| 32 | int (*device_enable)(struct device *dev); | ||
| 32 | unsigned short *keymap; | 33 | unsigned short *keymap; |
| 33 | u32 keymapsize; | 34 | u32 keymapsize; |
| 34 | u8 rep:1; | 35 | u8 rep:1; |