diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-06 15:25:14 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-06 15:25:14 -0300 |
commit | 8b21bbd63b7b73b55a57f2d8b1bf2aacd2f80874 (patch) | |
tree | 24d0c872180f0f75796d8444bdeb003586d12e4a /linux/drivers/media/video/cx88 | |
parent | ea036ab76194bc4f02dbb0803e4d977044636188 (diff) | |
parent | d2e4d325373507cb36a3c4993cd675331edad4cd (diff) | |
download | mediapointer-dvb-s2-8b21bbd63b7b73b55a57f2d8b1bf2aacd2f80874.tar.gz mediapointer-dvb-s2-8b21bbd63b7b73b55a57f2d8b1bf2aacd2f80874.tar.bz2 |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88')
-rw-r--r-- | linux/drivers/media/video/cx88/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx88/Kconfig b/linux/drivers/media/video/cx88/Kconfig index b0d7d6a7a..10e20d819 100644 --- a/linux/drivers/media/video/cx88/Kconfig +++ b/linux/drivers/media/video/cx88/Kconfig @@ -2,10 +2,9 @@ config VIDEO_CX88 tristate "Conexant 2388x (bt878 successor) support" depends on VIDEO_DEV && PCI && I2C && INPUT select I2C_ALGOBIT - select FW_LOADER select VIDEO_BTCX select VIDEOBUF_DMA_SG - select MEDIA_TUNER + select VIDEO_TUNER select VIDEO_TVEEPROM select VIDEO_IR select VIDEO_WM8775 if VIDEO_HELPER_CHIPS_AUTO @@ -34,8 +33,9 @@ config VIDEO_CX88_ALSA config VIDEO_CX88_BLACKBIRD tristate "Blackbird MPEG encoder support (cx2388x + cx23416)" - depends on VIDEO_CX88 + depends on VIDEO_CX88 && HOTPLUG select VIDEO_CX2341X + select FW_LOADER ---help--- This adds support for MPEG encoder cards based on the Blackbird reference design, using the Conexant 2388x |