diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 00:14:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 00:14:26 -0400 |
| commit | d5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch) | |
| tree | 4facc6d96116b032a3c1cb2ced9b2a3008e9216e /drivers/input/misc/Kconfig | |
| parent | eb6e8605ee5f5b4e116451bf01b3f35eac446dde (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/input/misc/Kconfig')
| -rw-r--r-- | drivers/input/misc/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 48cdabec372a..c44b9eafc556 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig | |||
| @@ -80,6 +80,16 @@ config INPUT_M68K_BEEP | |||
| 80 | tristate "M68k Beeper support" | 80 | tristate "M68k Beeper support" |
| 81 | depends on M68K | 81 | depends on M68K |
| 82 | 82 | ||
| 83 | config INPUT_MAX8925_ONKEY | ||
| 84 | tristate "MAX8925 ONKEY support" | ||
| 85 | depends on MFD_MAX8925 | ||
| 86 | help | ||
| 87 | Support the ONKEY of MAX8925 PMICs as an input device | ||
| 88 | reporting power button status. | ||
| 89 | |||
| 90 | To compile this driver as a module, choose M here: the module | ||
| 91 | will be called max8925_onkey. | ||
| 92 | |||
| 83 | config INPUT_APANEL | 93 | config INPUT_APANEL |
| 84 | tristate "Fujitsu Lifebook Application Panel buttons" | 94 | tristate "Fujitsu Lifebook Application Panel buttons" |
| 85 | depends on X86 && I2C && LEDS_CLASS | 95 | depends on X86 && I2C && LEDS_CLASS |