Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 181556
b: refs/heads/master
c: 700b8ae
h: refs/heads/master
v: v3
  • Loading branch information
Devin Heitmueller authored and Mauro Carvalho Chehab committed Feb 26, 2010
1 parent 56364fd commit cfdca35
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9972de904216828c9f9f9d638df52206aa2bacd1
refs/heads/master: 700b8aecc99f3bef09bc20c745d20bb2868047cc
11 changes: 11 additions & 0 deletions trunk/drivers/media/video/cx18/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,14 @@ config VIDEO_CX18

To compile this driver as a module, choose M here: the
module will be called cx18.

config VIDEO_CX18_ALSA
tristate "Conexant 23418 DMA audio support"
depends on VIDEO_CX18 && SND && EXPERIMENTAL
select SND_PCM
---help---
This is a video4linux driver for direct (DMA) audio on
Conexant 23418 based TV cards using ALSA.

To compile this driver as a module, choose M here: the
module will be called cx18-alsa.
2 changes: 2 additions & 0 deletions trunk/drivers/media/video/cx18/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ cx18-objs := cx18-driver.o cx18-cards.o cx18-i2c.o cx18-firmware.o cx18-gpio.
cx18-mailbox.o cx18-vbi.o cx18-audio.o cx18-video.o cx18-irq.o \
cx18-av-core.o cx18-av-audio.o cx18-av-firmware.o cx18-av-vbi.o cx18-scb.o \
cx18-dvb.o cx18-io.o
cx18-alsa-objs := cx18-alsa-main.o cx18-alsa-pcm.o

obj-$(CONFIG_VIDEO_CX18) += cx18.o
obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o

EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
Expand Down

0 comments on commit cfdca35

Please sign in to comment.