From 2e1d9f2f79acfb96b61732f27ebe5c4a79153c86 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 6 May 2008 13:46:12 -0300 Subject: [PATCH] --- yaml --- r: 96669 b: refs/heads/master c: ec44c9aed0eddceaef3c6b4d23f6d7702ec57b4d h: refs/heads/master i: 96667: aac8b334dc05dd8fdcd573b635dc63177d244c16 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 52fe954a7bf0..f174a3348399 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eabcaf32041fcd04672049e76124bd4cd63b1cbf +refs/heads/master: ec44c9aed0eddceaef3c6b4d23f6d7702ec57b4d diff --git a/trunk/drivers/media/video/cx88/Kconfig b/trunk/drivers/media/video/cx88/Kconfig index f1e799141256..10e20d8196dc 100644 --- a/trunk/drivers/media/video/cx88/Kconfig +++ b/trunk/drivers/media/video/cx88/Kconfig @@ -2,7 +2,6 @@ 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 VIDEO_TUNER @@ -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