From b1a18180024bb34258f9956d8e4c869f0fefa972 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 7 Nov 2011 06:26:59 -0300 Subject: [PATCH] --- yaml --- r: 285209 b: refs/heads/master c: 1df3a2c6d036f4923c229fa98725deda320680e1 h: refs/heads/master i: 285207: d91749c8caf94dd736b464e2cdcc2998f42ae884 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/Kconfig | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5009436e0560..32dbc4bb9f19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 486eeb5628f812b4836405e2b2e76594287dd873 +refs/heads/master: 1df3a2c6d036f4923c229fa98725deda320680e1 diff --git a/trunk/drivers/media/video/cx88/Kconfig b/trunk/drivers/media/video/cx88/Kconfig index 5c42abdf422f..3598dc087b08 100644 --- a/trunk/drivers/media/video/cx88/Kconfig +++ b/trunk/drivers/media/video/cx88/Kconfig @@ -70,11 +70,6 @@ config VIDEO_CX88_DVB To compile this driver as a module, choose M here: the module will be called cx88-dvb. -config VIDEO_CX88_MPEG - tristate - depends on VIDEO_CX88_DVB || VIDEO_CX88_BLACKBIRD - default y - config VIDEO_CX88_VP3054 tristate "VP-3054 Secondary I2C Bus Support" default m @@ -84,3 +79,8 @@ config VIDEO_CX88_VP3054 Conexant 2388x chip and the MT352 demodulator, which also require support for the VP-3054 Secondary I2C bus, such at DNTV Live! DVB-T Pro. + +config VIDEO_CX88_MPEG + tristate + depends on VIDEO_CX88_DVB || VIDEO_CX88_BLACKBIRD + default y