3 files changed, 8 insertions, 16 deletions

diff --git a/include/linux/i2c/tsc2007.h b/include/linux/i2c/tsc2007.h
index 506a9f7af51e..4f35b6ad3889 100644
--- a/include/linux/i2c/tsc2007.h
+++ b/include/linux/i2c/tsc2007.h
@@ -7,16 +7,14 @@ struct tsc2007_platform_data {
         u16     model;                          /* 2007. */
         u16     x_plate_ohms;   /* must be non-zero value */
         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
-                                                   interrupt source */
+        int     (*get_pendown_state)(struct device *);
+        /* If needed, clear 2nd level interrupt source */
+        void    (*clear_penirq)(void);
         int     (*init_platform_hw)(void);
         void    (*exit_platform_hw)(void);
 };
diff --git a/include/linux/platform_data/keypad-ep93xx.h b/include/linux/platform_data/keypad-ep93xx.h
index 1e2f4e97f428..adccee25b162 100644
--- a/include/linux/platform_data/keypad-ep93xx.h
+++ b/include/linux/platform_data/keypad-ep93xx.h
@@ -1,9 +1,5 @@
-/*
- * arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
- */
-
-#ifndef __ASM_ARCH_EP93XX_KEYPAD_H
-#define __ASM_ARCH_EP93XX_KEYPAD_H
+#ifndef __KEYPAD_EP93XX_H
+#define __KEYPAD_EP93XX_H
 
 struct matrix_keymap_data;
 
@@ -32,4 +28,4 @@ struct ep93xx_keypad_platform_data {
 #define EP93XX_MATRIX_ROWS              (8)
 #define EP93XX_MATRIX_COLS              (8)
 
-#endif  /* __ASM_ARCH_EP93XX_KEYPAD_H */
+#endif  /* __KEYPAD_EP93XX_H */
diff --git a/include/linux/platform_data/keypad-omap.h b/include/linux/platform_data/keypad-omap.h
index a6b21eddb212..c3a3abae98f0 100644
--- a/include/linux/platform_data/keypad-omap.h
+++ b/include/linux/platform_data/keypad-omap.h
@@ -1,14 +1,12 @@
 /*
- *  arch/arm/plat-omap/include/mach/keypad.h
- *
  *  Copyright (C) 2006 Komal Shah <komal_shah802003@yahoo.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#ifndef ASMARM_ARCH_KEYPAD_H
-#define ASMARM_ARCH_KEYPAD_H
+#ifndef __KEYPAD_OMAP_H
+#define __KEYPAD_OMAP_H
 
 #ifndef CONFIG_ARCH_OMAP1
 #warning Please update the board to use matrix-keypad driver