Remove extra code in arch/arm/*omap* to move it into omap-pool branch

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / keypad.h

diff --git a/arch/arm/plat-omap/include/mach/keypad.h b/arch/arm/plat-omap/include/mach/keypad.h
index b7f270a6782188a471469a366c7ea86eac45ccbb..232923aaf61d34ed0f66daf5af54d1fad7c73a13 100644 (file)
--- a/arch/arm/plat-omap/include/mach/keypad.h
+++ b/arch/arm/plat-omap/include/mach/keypad.h
@@ -14,7 +14,6 @@ struct omap_kp_platform_data {
        int rows;
        int cols;
        int *keymap;
-       int irq;
        unsigned int keymapsize;
        unsigned int rep:1;
        unsigned long delay;
@@ -34,12 +33,7 @@ struct omap_kp_platform_data {
 #define GROUP_3                (3 << 16)
 #define GROUP_MASK     GROUP_3
 
-#define ROWCOL_MASK            0xFF000000
-#define KEY_PERSISTENT         0x00800000
-#define KEYNUM_MASK            0x00EFFFFF
 #define KEY(col, row, val) (((col) << 28) | ((row) << 24) | (val))
-#define PERSISTENT_KEY(col, row) (((col) << 28) | ((row) << 24) | \
-                                               KEY_PERSISTENT)
 
 #endif