Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285325
b: refs/heads/master
c: 078a68c
h: refs/heads/master
i:
  285323: fa47466
v: v3
  • Loading branch information
Stefan Ringel authored and Mauro Carvalho Chehab committed Nov 28, 2011
1 parent fe8b301 commit 98d0c4c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 32f6f3ac5468bbbe0263d29daa16f38d04c2274f
refs/heads/master: 078a68c11fe0580a23754fac25a6d9896719278e
6 changes: 3 additions & 3 deletions trunk/drivers/media/video/tm6000/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
config VIDEO_TM6000
tristate "TV Master TM5600/6000/6010 driver"
depends on VIDEO_DEV && I2C && INPUT && RC_CORE && USB && EXPERIMENTAL
depends on VIDEO_DEV && I2C && INPUT && RC_CORE && USB
select VIDEO_TUNER
select MEDIA_TUNER_XC2028
select MEDIA_TUNER_XC5000
Expand All @@ -16,7 +16,7 @@ config VIDEO_TM6000

config VIDEO_TM6000_ALSA
tristate "TV Master TM5600/6000/6010 audio support"
depends on VIDEO_TM6000 && SND && EXPERIMENTAL
depends on VIDEO_TM6000 && SND
select SND_PCM
---help---
This is a video4linux driver for direct (DMA) audio for
Expand All @@ -27,7 +27,7 @@ config VIDEO_TM6000_ALSA

config VIDEO_TM6000_DVB
tristate "DVB Support for tm6000 based TV cards"
depends on VIDEO_TM6000 && DVB_CORE && USB && EXPERIMENTAL
depends on VIDEO_TM6000 && DVB_CORE && USB
select DVB_ZL10353
---help---
This adds support for DVB cards based on the tm5600/tm6000 chip.

0 comments on commit 98d0c4c

Please sign in to comment.