Merge branch 'next' into for-linus

2009-04-16 08:51:52 -07:00
parent ba28f22e7c 3f3e7c6e13
commit 0c387ec88a
15 changed files with 121 additions and 43 deletions
--- 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);
 };