diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 13:08:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 13:08:13 -0400 |
| commit | 91ec65ba335db80b686f93b9eb531d537e712e61 (patch) | |
| tree | 462ab5101fa164ad84dae8afe5e220cc91f3ff29 /include/linux | |
| parent | df42654e90b3045691f4c327075897aed9691ebe (diff) | |
| parent | 0c387ec88abf4f1ddfe8c3be10ea981bc447b406 (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: ads7846 - fix unsafe disable_irq
Input: mainstone-wm97xx - fix condition in pen_up
Input: pc110pad - remove unused variable dev
Input: bf54x-keys - remove depreciated IRQF_SAMPLE_RANDOM flag
Input: ad7877, ad7879 - remove depreciated IRQF_SAMPLE_RANDOM flag
Input: da9034-ts - make pen {down,up} events more reliable
Input: da9034-ts - add Bin Yang as co-author of the driver
Input: atkbd - add forced release keys quirk for Samsung NC20
Input: atkbd - add forced release keys quirk for Samsung Q45
Input: gameport - fix attach driver code
Input: hp_sdc_rtc should depend on serio
Input: wm97xx - don't specify IRQF_SAMPLE_RANDOM
Input: ads7846 - introduce platform specific way to synchronize sampling
Input: remove unnecessary synchronize_rcu() call
Input: i8042 - add a DMI table for the i8042.reset option
Input: i8042 - introduce a tougher reset
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/spi/ads7846.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h index 05eab2f11e63..2ea20320c093 100644 --- a/include/linux/spi/ads7846.h +++ b/include/linux/spi/ads7846.h | |||
| @@ -51,5 +51,6 @@ struct ads7846_platform_data { | |||
| 51 | void **filter_data); | 51 | void **filter_data); |
| 52 | int (*filter) (void *filter_data, int data_idx, int *val); | 52 | int (*filter) (void *filter_data, int data_idx, int *val); |
| 53 | void (*filter_cleanup)(void *filter_data); | 53 | void (*filter_cleanup)(void *filter_data); |
| 54 | void (*wait_for_sync)(void); | ||
| 54 | }; | 55 | }; |
| 55 | 56 | ||