Merge branch 'next' into for-linus

This commit is contained in:
Dmitry Torokhov 2009-04-16 08:51:52 -07:00
commit 0c387ec88a
15 changed files with 121 additions and 43 deletions

View file

@ -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);
};