diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-19 23:52:05 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-19 23:52:05 +0200 |
| commit | 4cd2e721742114a20b2ebc1822bba95c724e44b2 (patch) | |
| tree | f3948137b79708938ddd84f1a0400d6d8a28c94a /linux/drivers/media/video/cx88 | |
| parent | fb70cc5ac6a14c86a9573bbb7ec6b95d32e287bb (diff) | |
| parent | 6ff9606bf157734998241b66ac10bb11b913401e (diff) | |
| download | mediapointer-dvb-s2-4cd2e721742114a20b2ebc1822bba95c724e44b2.tar.gz mediapointer-dvb-s2-4cd2e721742114a20b2ebc1822bba95c724e44b2.tar.bz2 | |
Merge: from v4l-dvb
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-tvaudio.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 2577039bf..383af5609 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1082,9 +1082,7 @@ struct cx88_board cx88_boards[] = { .gpio0 = 0x3de6, .gpio2 = 0x00ff, }, -#if 0 .blackbird = 1, -#endif }, [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = { .name = "DViCO FusionHDTV DVB-T Hybrid", diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c index d1e20eca6..78f6d2c76 100644 --- a/linux/drivers/media/video/cx88/cx88-tvaudio.c +++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c @@ -154,6 +154,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) switch (core->board) { case CX88_BOARD_HAUPPAUGE_ROSLYN: case CX88_BOARD_KWORLD_MCE200_DELUXE: + case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT: cx_clear(AUD_CTL, EN_I2SIN_ENABLE); break; default: |