summaryrefslogtreecommitdiffstats
path: root/include/linux/spi
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-04-16 08:51:52 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-04-16 08:51:52 -0700
commit0c387ec88abf4f1ddfe8c3be10ea981bc447b406 (patch)
tree7510842a16aa54e3fec96aed2b3126109cda8d85 /include/linux/spi
parentba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d (diff)
parent3f3e7c6e139f704e2f48ea3b45ff7724a8d46456 (diff)
downloadkernel-crypto-0c387ec88abf4f1ddfe8c3be10ea981bc447b406.tar.gz
kernel-crypto-0c387ec88abf4f1ddfe8c3be10ea981bc447b406.tar.xz
kernel-crypto-0c387ec88abf4f1ddfe8c3be10ea981bc447b406.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/spi')
-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 05eab2f11e6..2ea20320c09 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);
};