summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-04-16 17:51:52 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-04-16 17:51:52 +0200
commit0c387ec88abf4f1ddfe8c3be10ea981bc447b406 (patch)
tree7510842a16aa54e3fec96aed2b3126109cda8d85 /include
parentMerge branch 'next' into for-linus (diff)
parentInput: ads7846 - fix unsafe disable_irq (diff)
downloadlinux-0c387ec88abf4f1ddfe8c3be10ea981bc447b406.tar.xz
linux-0c387ec88abf4f1ddfe8c3be10ea981bc447b406.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'include')
-rw-r--r--include/linux/spi/ads7846.h1
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 {
void **filter_data);
int (*filter) (void *filter_data, int data_idx, int *val);
void (*filter_cleanup)(void *filter_data);
+ void (*wait_for_sync)(void);
};