diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:36:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:36:32 -0500 |
| commit | 593195f9b2309693f27b402f34573f7920b82c3e (patch) | |
| tree | 54d55557665e72e90ef35a1e0f008d381c17ed98 /drivers/media/video/saa7134/Kconfig | |
| parent | 983d5dbdb2b38d024935f560a91cddcf704875f3 (diff) | |
| parent | f9cfc08d640e1586e76eee63cc2b0a9360bc7c7e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/saa7134/Kconfig')
| -rw-r--r-- | drivers/media/video/saa7134/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig index 8a5c3e71b37d..86671a43e769 100644 --- a/drivers/media/video/saa7134/Kconfig +++ b/drivers/media/video/saa7134/Kconfig | |||
| @@ -15,7 +15,7 @@ config VIDEO_SAA7134 | |||
| 15 | config VIDEO_SAA7134_ALSA | 15 | config VIDEO_SAA7134_ALSA |
| 16 | tristate "Philips SAA7134 DMA audio support" | 16 | tristate "Philips SAA7134 DMA audio support" |
| 17 | depends on VIDEO_SAA7134 && SND | 17 | depends on VIDEO_SAA7134 && SND |
| 18 | select SND_PCM_OSS | 18 | select SND_PCM |
| 19 | ---help--- | 19 | ---help--- |
| 20 | This is a video4linux driver for direct (DMA) audio in | 20 | This is a video4linux driver for direct (DMA) audio in |
| 21 | Philips SAA713x based TV cards using ALSA | 21 | Philips SAA713x based TV cards using ALSA |