Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 144340
b: refs/heads/master
c: 3964b58
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Apr 29, 2009
1 parent 2267ea1 commit 3e92f95
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 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: 92ab9baee3e075e4d84d9b74f6da5b047539e323
refs/heads/master: 3964b58a25fdca066011600bf58b38d00e9ae28d
44 changes: 22 additions & 22 deletions trunk/drivers/media/video/cx231xx/Kconfig
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
config VIDEO_CX231XX
tristate "Conexant cx231xx USB video capture support"
depends on VIDEO_DEV && I2C && INPUT
select VIDEO_TUNER
select VIDEO_TVEEPROM
select VIDEO_IR
select VIDEOBUF_VMALLOC
select VIDEO_CX25840
select VIDEO_CX231XX_ALSA
tristate "Conexant cx231xx USB video capture support"
depends on VIDEO_DEV && I2C && INPUT
select VIDEO_TUNER
select VIDEO_TVEEPROM
select VIDEO_IR
select VIDEOBUF_VMALLOC
select VIDEO_CX25840

---help---
This is a video4linux driver for Conexant 231xx USB based TV cards.
Expand All @@ -15,21 +14,22 @@ config VIDEO_CX231XX
module will be called cx231xx

config VIDEO_CX231XX_ALSA
tristate "Conexant Cx231xx ALSA audio module"
depends on VIDEO_CX231XX && SND
select SND_PCM
tristate "Conexant Cx231xx ALSA audio module"
depends on VIDEO_CX231XX && SND
select SND_PCM

---help---
This is an ALSA driver for Cx231xx USB based TV cards.
---help---
This is an ALSA driver for Cx231xx USB based TV cards.

To compile this driver as a module, choose M here: the
module will be called cx231xx-alsa
To compile this driver as a module, choose M here: the
module will be called cx231xx-alsa

config VIDEO_CX231XX_DVB
tristate "DVB/ATSC Support for Cx231xx based TV cards"
depends on VIDEO_CX231XX && DVB_CORE
select VIDEOBUF_DVB
select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE
---help---
This adds support for DVB cards based on the
Conexant cx231xx chips.
tristate "DVB/ATSC Support for Cx231xx based TV cards"
depends on VIDEO_CX231XX && DVB_CORE
select VIDEOBUF_DVB
select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE

---help---
This adds support for DVB cards based on the
Conexant cx231xx chips.

0 comments on commit 3e92f95

Please sign in to comment.