diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-23 14:44:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-23 14:44:25 -0800 |
| commit | 57949e8006de9643ac95447143e0211be3ff5f81 (patch) | |
| tree | 2005f08ad1abcdc7268b93815e763017cfd25962 /arch | |
| parent | 13d1ea9a20ed7d77f98c1622dcf9f3881649f6d7 (diff) | |
| parent | 1d64b655dc083df5c5ac39945ccbbc6532903bf1 (diff) | |
| download | linux-57949e8006de9643ac95447143e0211be3ff5f81.tar.gz linux-57949e8006de9643ac95447143e0211be3ff5f81.tar.bz2 linux-57949e8006de9643ac95447143e0211be3ff5f81.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: serio/gameport - use 'long' system workqueue
Input: synaptics - document 0x0c query
Input: tegra-kbc - add function keymap
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/kbc.h | 1 |
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 66ad2760c621..04c779832c78 100644 --- a/arch/arm/mach-tegra/include/mach/kbc.h +++ b/arch/arm/mach-tegra/include/mach/kbc.h @@ -57,5 +57,6 @@ struct tegra_kbc_platform_data { const struct matrix_keymap_data *keymap_data; bool wakeup; + bool use_fn_map; }; #endif |