diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-16 11:51:52 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-16 11:51:52 -0400 |
| commit | 0c387ec88abf4f1ddfe8c3be10ea981bc447b406 (patch) | |
| tree | 7510842a16aa54e3fec96aed2b3126109cda8d85 /include/linux/spi | |
| parent | ba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d (diff) | |
| parent | 3f3e7c6e139f704e2f48ea3b45ff7724a8d46456 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/spi')
| -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 | ||