aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/include/mach/kbc.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-12 13:11:43 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-01-12 13:11:43 +0900
commitb1bdd255661369cb6eb90b6e181169b5e6d0f9b6 (patch)
tree17d15f3a6dc5bdd6205070dbef0e339421b13d25 /arch/arm/mach-tegra/include/mach/kbc.h
parentMerge branch 'sh/hwblk' into sh-latest (diff)
parentsh: sh2a: Improve cache flush/invalidate functions (diff)
downloadlinux-dev-b1bdd255661369cb6eb90b6e181169b5e6d0f9b6.tar.xz
linux-dev-b1bdd255661369cb6eb90b6e181169b5e6d0f9b6.zip
Merge branch 'sh/nommu' into sh-latest
Diffstat (limited to 'arch/arm/mach-tegra/include/mach/kbc.h')
-rw-r--r--arch/arm/mach-tegra/include/mach/kbc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/include/mach/kbc.h b/arch/arm/mach-tegra/include/mach/kbc.h
index 4f3572a1c684..20bb0545f992 100644
--- a/arch/arm/mach-tegra/include/mach/kbc.h
+++ b/arch/arm/mach-tegra/include/mach/kbc.h
@@ -53,6 +53,7 @@ struct tegra_kbc_platform_data {
struct tegra_kbc_pin_cfg pin_cfg[KBC_MAX_GPIO];
const struct matrix_keymap_data *keymap_data;
+ u32 wakeup_key;
bool wakeup;
bool use_fn_map;
bool use_ghost_filter;