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>

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
 #