From c1d3ec20c4358a290d519518cbe135e723177814 Mon Sep 17 00:00:00 2001 From: Andy Walls Date: Mon, 3 Sep 2012 17:03:41 -0300 Subject: [PATCH] --- yaml --- r: 331031 b: refs/heads/master c: 24e527a0e7b23ca0158a4251157d234e156f88ca h: refs/heads/master i: 331029: 52d77ecf009ebd73128de1b3152b56cbe61bfb4a 331027: 4498b34a81b10262d5f94a2af979a8318b1baf76 331023: cba59a2a37e13e9d96ce07181ead0f1f08829f5b v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/ivtv/Kconfig | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bc8fa2e102de..8811524cb005 100644 --- 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 index 3906b883e2bc..dd6ee57e3a4c 100644 --- 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.