V4L/DVB (7789b): Fix merge conflicts

[linux-2.6-omap-h63xx.git] / drivers / media / video / cx18 / Kconfig

diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig
index be654a27bd3c11e842df9d270d43e806f5e9dc02..acc4b47f1d1dc8437ba648c7509d78f3a71ebfed 100644 (file)
--- a/drivers/media/video/cx18/Kconfig
+++ b/drivers/media/video/cx18/Kconfig
@@ -4,7 +4,7 @@ config VIDEO_CX18
        select I2C_ALGOBIT
        select FW_LOADER
        select VIDEO_IR
-       select VIDEO_TUNER
+       select MEDIA_TUNER
        select VIDEO_TVEEPROM
        select VIDEO_CX2341X
        select VIDEO_CS5345