diff options
author | Devin Heitmueller <dheitmueller@kernellabs.com> | 2009-11-19 21:17:40 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:10:43 -0500 |
commit | 700b8aecc99f3bef09bc20c745d20bb2868047cc (patch) | |
tree | 5fdbd39aa9495be5371c58ad8123213d08c0bccd /drivers/media/video/cx18 | |
parent | 9972de904216828c9f9f9d638df52206aa2bacd1 (diff) |
V4L/DVB: cx18: add cx18-alsa module to Makefile
Add cx18-alsa to the Makefile and Kconfig
This work was sponsored by ONELAN Limited.
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18')
-rw-r--r-- | drivers/media/video/cx18/Kconfig | 11 | ||||
-rw-r--r-- | drivers/media/video/cx18/Makefile | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig index e8a50a611ebc..baf7e91ee0f5 100644 --- a/drivers/media/video/cx18/Kconfig +++ b/drivers/media/video/cx18/Kconfig | |||
@@ -19,3 +19,14 @@ config VIDEO_CX18 | |||
19 | 19 | ||
20 | To compile this driver as a module, choose M here: the | 20 | To compile this driver as a module, choose M here: the |
21 | module will be called cx18. | 21 | module will be called cx18. |
22 | |||
23 | config VIDEO_CX18_ALSA | ||
24 | tristate "Conexant 23418 DMA audio support" | ||
25 | depends on VIDEO_CX18 && SND && EXPERIMENTAL | ||
26 | select SND_PCM | ||
27 | ---help--- | ||
28 | This is a video4linux driver for direct (DMA) audio on | ||
29 | Conexant 23418 based TV cards using ALSA. | ||
30 | |||
31 | To compile this driver as a module, choose M here: the | ||
32 | module will be called cx18-alsa. | ||
diff --git a/drivers/media/video/cx18/Makefile b/drivers/media/video/cx18/Makefile index f7bf0edf93f9..2fadd9ded340 100644 --- a/drivers/media/video/cx18/Makefile +++ b/drivers/media/video/cx18/Makefile | |||
@@ -3,8 +3,10 @@ cx18-objs := cx18-driver.o cx18-cards.o cx18-i2c.o cx18-firmware.o cx18-gpio. | |||
3 | cx18-mailbox.o cx18-vbi.o cx18-audio.o cx18-video.o cx18-irq.o \ | 3 | cx18-mailbox.o cx18-vbi.o cx18-audio.o cx18-video.o cx18-irq.o \ |
4 | cx18-av-core.o cx18-av-audio.o cx18-av-firmware.o cx18-av-vbi.o cx18-scb.o \ | 4 | cx18-av-core.o cx18-av-audio.o cx18-av-firmware.o cx18-av-vbi.o cx18-scb.o \ |
5 | cx18-dvb.o cx18-io.o | 5 | cx18-dvb.o cx18-io.o |
6 | cx18-alsa-objs := cx18-alsa-main.o cx18-alsa-pcm.o | ||
6 | 7 | ||
7 | obj-$(CONFIG_VIDEO_CX18) += cx18.o | 8 | obj-$(CONFIG_VIDEO_CX18) += cx18.o |
9 | obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o | ||
8 | 10 | ||
9 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 11 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core |
10 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 12 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends |