Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.

1 files changed, 12 insertions, 0 deletions

diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h
index adb3dafd33e9..3387e44dfd13 100644
--- a/include/linux/spi/ads7846.h
+++ b/include/linux/spi/ads7846.h
@@ -5,9 +5,17 @@
  *
  * It's OK if the min/max values are zero.
  */
+enum ads7846_filter {
+        ADS7846_FILTER_OK,
+        ADS7846_FILTER_REPEAT,
+        ADS7846_FILTER_IGNORE,
+};
+
 struct ads7846_platform_data {
         u16     model;                  /* 7843, 7845, 7846. */
         u16     vref_delay_usecs;       /* 0 for external vref; etc */
+        int     keep_vref_on:1;         /* set to keep vref on for differential
+                                         * measurements as well */
         u16     x_plate_ohms;
         u16     y_plate_ohms;
 
@@ -21,5 +29,9 @@ struct ads7846_platform_data {
         u16     debounce_rep;           /* additional consecutive good readings
                                          * required after the first two */
         int     (*get_pendown_state)(void);
+        int     (*filter_init)  (struct ads7846_platform_data *pdata,
+                                 void **filter_data);
+        int     (*filter)       (void *filter_data, int data_idx, int *val);
+        void    (*filter_cleanup)(void *filter_data);
 };