diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-30 04:02:33 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-30 04:02:33 +0200 |
| commit | ff138171ec6f84f311fe8c0395ad7f9e6d04feec (patch) | |
| tree | 7ad0ecafefb46988a6f8a69fd3fd6c43afa7b7d0 /drivers/media/video/cx18/Kconfig | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
| download | linux-ff138171ec6f84f311fe8c0395ad7f9e6d04feec.tar.xz linux-ff138171ec6f84f311fe8c0395ad7f9e6d04feec.zip | |
V4L/DVB (7789b): Fix merge conflicts
Some Kconfig names were changed. This patch reapplies the rename script,
fixing for those drivers merged after the patch that renamed those
items.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx18/Kconfig')
| -rw-r--r-- | drivers/media/video/cx18/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig index be654a27bd3c..acc4b47f1d1d 100644 --- 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 |