---

yaml --- r: 331031 b: refs/heads/master c: 24e527a h: refs/heads/master i: 331029: 52d77ec 331027: 4498b34 331023: cba59a2 v: v3
git-mirror · Sep 18, 2012 · c1d3ec2 · c1d3ec2
1 parent 1aee3ac
commit c1d3ec2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4313902ebe33155209472215c62d2f29d117be29
+refs/heads/master: 24e527a0e7b23ca0158a4251157d234e156f88ca
diff --git a/trunk/drivers/media/pci/ivtv/Kconfig b/trunk/drivers/media/pci/ivtv/Kconfig
@@ -29,12 +29,17 @@ config VIDEO_IVTV
 	  module will be called ivtv.
 
 config VIDEO_IVTV_ALSA
-	tristate "Conexant cx23415/cx23416 PCM audio capture support"
-	depends on VIDEO_IVTV && SND && EXPERIMENTAL
+	tristate "Conexant cx23415/cx23416 ALSA interface for PCM audio capture"
+	depends on VIDEO_IVTV && SND
 	select SND_PCM
 	---help---
-	  This is an ALSA interface driver for direct PCM audio capture from
-	  Conexant cx23415/cx23416 based PCI TV cards using the ivtv driver.
+	  This driver provides an ALSA interface as another method for user
+	  applications to obtain PCM audio data from Conexant cx23415/cx23416
+	  based PCI TV cards supported by the ivtv driver.
+
+	  The ALSA interface has much wider use in user applications performing
+	  PCM audio capture, than the V4L2 "/dev/video24" PCM audio interface
+	  provided by the main ivtv driver.
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called ivtv-alsa.