aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-17 22:34:27 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 07:29:08 -0300
commit367394ac5cce83d40e605b5c75ee27dbe3d42d92 (patch)
treee5b5a468252a58577e51f90581ee78afa4206dd4 /drivers/media
parentV4L/DVB (8395): saa7134: Fix Kbuild dependency of ir-kbd-i2c (diff)
downloadlinux-dev-367394ac5cce83d40e605b5c75ee27dbe3d42d92.tar.xz
linux-dev-367394ac5cce83d40e605b5c75ee27dbe3d42d92.zip
V4L/DVB (8396): video: Fix Kbuild dependency for VIDEO_IR_I2C
Instead of letting VIDEO_IR_I2C to be selected by VIDEO_IR, if I2C, convert it into a symbol that depends on both VIDEO_IR and I2C. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/Kconfig17
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 424cef1eca3b..f268dbeeb700 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -36,13 +36,9 @@ config VIDEOBUF_DVB
config VIDEO_BTCX
tristate
-config VIDEO_IR_I2C
- tristate
-
config VIDEO_IR
tristate
depends on INPUT
- select VIDEO_IR_I2C if I2C
config VIDEO_TVEEPROM
tristate
@@ -88,6 +84,19 @@ config VIDEO_HELPER_CHIPS_AUTO
In doubt, say Y.
+config VIDEO_IR_I2C
+ tristate "I2C module for IR" if !VIDEO_HELPER_CHIPS_AUTO
+ depends on I2C && VIDEO_IR
+ default y
+ ---help---
+ Most boards have an IR chip directly connected via GPIO. However,
+ some video boards have the IR connected via I2C bus.
+
+ If your board doesn't have an I2C IR chip, you may disable this
+ option.
+
+ In doubt, say Y.
+
#
# Encoder / Decoder module configuration
#