diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 17:42:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 17:42:49 +0100 |
| commit | c4d0a06860b8ade51836f07ae050245f9059c6d6 (patch) | |
| tree | 88931d8ccb3cc94bb2a895149ff18dfc448e3324 /drivers/input/Kconfig | |
| parent | ebb7c3b1a10a2cd3986f2db60612d2c6fbb915ab (diff) | |
| parent | 1f76bce8544acd38f7bb1e822540f8ca521e1b7f (diff) | |
Merge remote-tracking branch 'jstultz-android/linaro-fixes/experimental/android-3.9' into merge-androidlsk-android-2013.06
Conflicts:
arch/arm/common/Makefile
arch/arm/include/asm/irq.h
arch/arm/include/asm/smp.h
arch/arm/kernel/smp.c
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 38b523a1ece..3ad49c1f0a3 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -174,6 +174,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" |