Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window

Conflicts:
	fs/ocfs2/ioctl.c

1 files changed, 7 insertions, 0 deletions

diff --git a/include/linux/i2c/tsc2007.h b/include/linux/i2c/tsc2007.h
index c6361fbb7bf9..591427a63b06 100644
--- a/include/linux/i2c/tsc2007.h
+++ b/include/linux/i2c/tsc2007.h
@@ -6,6 +6,13 @@
 struct tsc2007_platform_data {
         u16     model;                          /* 2007. */
         u16     x_plate_ohms;
+        u16     max_rt; /* max. resistance above which samples are ignored */
+        unsigned long poll_delay; /* delay (in ms) after pen-down event
+                                     before polling starts */
+        unsigned long poll_period; /* time (in ms) between samples */
+        int     fuzzx; /* fuzz factor for X, Y and pressure axes */
+        int     fuzzy;
+        int     fuzzz;
 
         int     (*get_pendown_state)(void);
         void    (*clear_penirq)(void);          /* If needed, clear 2nd level