diff options
| author | Ishan Mittal <imittal@nvidia.com> | 2014-05-15 18:21:20 +0530 |
|---|---|---|
| committer | Ishan Mittal <imittal@nvidia.com> | 2014-05-29 12:41:59 +0530 |
| commit | 75c1032e7b6215de41e451a01033a342372105d4 (patch) | |
| tree | 54fe571dd5a1c1e69f93c219e1cdf9c072e87d88 /drivers/input/Kconfig | |
| parent | c436d07ff6b15f6540e7468c7c793ef15e55a921 (diff) | |
| parent | c4db79235d21ba1dcd10d42154910ac1ba8e3ed3 (diff) | |
Merge branch 'android-3.10' into rel-21
Bug 200004122
Bug 1511804
This merge takes AOSP commits from android-3.10 branch
Change-Id: I07ec2468114db0366d63777142c9572bbfadbc45
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
Diffstat (limited to 'drivers/input/Kconfig')
| -rw-r--r-- | drivers/input/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 67543a8f4443..24bb04ae7aec 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -177,12 +177,22 @@ config INPUT_APMPOWER config INPUT_KEYRESET tristate "Reset key" depends on INPUT + select INPUT_KEYCOMBO ---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. +config INPUT_KEYCOMBO + tristate "Key combo" + depends on INPUT + ---help--- + Say Y here if you want to take action when some keys are pressed; + + To compile this driver as a module, choose M here: the + module will be called keycombo. + config INPUT_CFBOOST tristate "Input event CPU frequency booster" depends on INPUT && CPU_FREQ |