summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2009-03-29 08:44:32 +0200
committerJean-Francois Moine <moinejf@free.fr>2009-03-29 08:44:32 +0200
commitffa071fb6b99731b41db5e814dbb2b0403c7c98c (patch)
tree9ac2f7c13def69143db958230deebd96fc9a0f54 /linux/drivers/media/video
parent3869711ceb52dc8c4035021446b35750bef6fb56 (diff)
parent2cc0abb17583ba0769357943dee38920a8cd757e (diff)
downloadmediapointer-dvb-s2-ffa071fb6b99731b41db5e814dbb2b0403c7c98c.tar.gz
mediapointer-dvb-s2-ffa071fb6b99731b41db5e814dbb2b0403c7c98c.tar.bz2
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/cx231xx/Kconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx231xx/Kconfig b/linux/drivers/media/video/cx231xx/Kconfig
index aba05d3bd..477d4ab5e 100644
--- a/linux/drivers/media/video/cx231xx/Kconfig
+++ b/linux/drivers/media/video/cx231xx/Kconfig
@@ -7,11 +7,11 @@ config VIDEO_CX231XX
select VIDEOBUF_VMALLOC
select VIDEO_CX25840
- ---help---
- This is a video4linux driver for Conexant 231xx USB based TV cards.
+ ---help---
+ This is a video4linux driver for Conexant 231xx USB based TV cards.
- To compile this driver as a module, choose M here: the
- module will be called cx231xx
+ To compile this driver as a module, choose M here: the
+ module will be called cx231xx
config VIDEO_CX231XX_ALSA
tristate "Conexant Cx231xx ALSA audio module"