diff options
author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:41:00 -0800 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:41:00 -0800 |
commit | a70c0eab1897b2bb15d89f43267828682950842e (patch) | |
tree | 3b53319c93e0a73db1d8df5947e6ed621ccbb5df /drivers/input/Kconfig | |
parent | 83adb17804d48ead8fc91a8ab7dda81db13b9444 (diff) | |
parent | 7f9ed524778bcdcd8a51bdeab2095655fb57c431 (diff) |
Merge branch 'korg-android-3.1' into korg-android+linux-tegra-3.1
Conflicts:
arch/arm/mm/cache-l2x0.c
drivers/misc/Kconfig
drivers/misc/Makefile
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'drivers/input/Kconfig')
-rw-r--r-- | drivers/input/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 23e82e46656d..c0e639c1b179 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -161,6 +161,15 @@ config INPUT_APMPOWER To compile this driver as a module, choose M here: the module will be called apm-power. +config INPUT_KEYRESET + tristate "Reset key" + depends on INPUT + ---help--- + Say Y here if you want to reboot when some keys are pressed; + + To compile this driver as a module, choose M here: the + module will be called keyreset. + comment "Input Device Drivers" source "drivers/input/keyboard/Kconfig" |