Merge omap-drivers

[linux-2.6-omap-h63xx.git] / include / linux / spi / ads7846.h

diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h
index c371475829b3e673b07c8a319a14b7ebfa492698..adb3dafd33e96a6d12c122fc62101b6c7a5c0947 100644 (file)
--- a/include/linux/spi/ads7846.h
+++ b/include/linux/spi/ads7846.h
@@ -5,17 +5,9 @@
  *
  * 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;
 
@@ -29,9 +21,5 @@ 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);
 };