Merge branches 'core-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel...

[pandora-kernel.git] / arch / arm / mach-tegra / include / mach / kbc.h

diff --git a/arch/arm/mach-tegra/include/mach/kbc.h b/arch/arm/mach-tegra/include/mach/kbc.h
index 04c7798..4f3572a 100644 (file)
--- a/arch/arm/mach-tegra/include/mach/kbc.h
+++ b/arch/arm/mach-tegra/include/mach/kbc.h
@@ -50,13 +50,11 @@ struct tegra_kbc_platform_data {
        unsigned int debounce_cnt;
        unsigned int repeat_cnt;
 
-       unsigned int wake_cnt; /* 0:wake on any key >1:wake on wake_cfg */
-       const struct tegra_kbc_wake_key *wake_cfg;
-
        struct tegra_kbc_pin_cfg pin_cfg[KBC_MAX_GPIO];
        const struct matrix_keymap_data *keymap_data;
 
        bool wakeup;
        bool use_fn_map;
+       bool use_ghost_filter;
 };
 #endif