diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /drivers/media/IR/Kconfig | |
| parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'drivers/media/IR/Kconfig')
| -rw-r--r-- | drivers/media/IR/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/IR/Kconfig b/drivers/media/IR/Kconfig index 195c6cf359f6..d22a8ec523fc 100644 --- a/drivers/media/IR/Kconfig +++ b/drivers/media/IR/Kconfig | |||
| @@ -13,6 +13,7 @@ source "drivers/media/IR/keymaps/Kconfig" | |||
| 13 | config IR_NEC_DECODER | 13 | config IR_NEC_DECODER |
| 14 | tristate "Enable IR raw decoder for the NEC protocol" | 14 | tristate "Enable IR raw decoder for the NEC protocol" |
| 15 | depends on IR_CORE | 15 | depends on IR_CORE |
| 16 | select BITREVERSE | ||
| 16 | default y | 17 | default y |
| 17 | 18 | ||
| 18 | ---help--- | 19 | ---help--- |
| @@ -22,6 +23,7 @@ config IR_NEC_DECODER | |||
| 22 | config IR_RC5_DECODER | 23 | config IR_RC5_DECODER |
| 23 | tristate "Enable IR raw decoder for the RC-5 protocol" | 24 | tristate "Enable IR raw decoder for the RC-5 protocol" |
| 24 | depends on IR_CORE | 25 | depends on IR_CORE |
| 26 | select BITREVERSE | ||
| 25 | default y | 27 | default y |
| 26 | 28 | ||
| 27 | ---help--- | 29 | ---help--- |