diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-04 05:54:15 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-04 05:59:45 -0500 |
| commit | a2e71271535fde493c32803b1f34789f97efcb5e (patch) | |
| tree | 90d7139bea2f49e947f27af92614fa6eca50b64d /drivers/input/misc/Kconfig | |
| parent | 6d7aa9d721c8c640066142fd9534afcdf68d7f9d (diff) | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
Merge commit 'v2.6.32-rc6' into perf/core
Conflicts:
tools/perf/Makefile
Merge reason: Resolve the conflict, merge to upstream and merge in
perf fixes so we can add a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/input/misc/Kconfig')
| -rw-r--r-- | drivers/input/misc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 02f4f8f1db6f..a9bb2544b2de 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig | |||
| @@ -227,6 +227,7 @@ config INPUT_WINBOND_CIR | |||
| 227 | depends on X86 && PNP | 227 | depends on X86 && PNP |
| 228 | select NEW_LEDS | 228 | select NEW_LEDS |
| 229 | select LEDS_CLASS | 229 | select LEDS_CLASS |
| 230 | select LEDS_TRIGGERS | ||
| 230 | select BITREVERSE | 231 | select BITREVERSE |
| 231 | help | 232 | help |
| 232 | Say Y here if you want to use the IR remote functionality found | 233 | Say Y here if you want to use the IR remote functionality found |