diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 11:25:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 11:25:45 -0300 |
| commit | d494aaee63ab3aa0c87d705e5c1b31baafb257bc (patch) | |
| tree | 27a927e0765c9f8e82fa371a9f72acb8e72cd364 /v4l | |
| parent | 10e915b9906d789549e8e8d8b8a53f81368f5380 (diff) | |
| download | mediapointer-dvb-s2-d494aaee63ab3aa0c87d705e5c1b31baafb257bc.tar.gz mediapointer-dvb-s2-d494aaee63ab3aa0c87d705e5c1b31baafb257bc.tar.bz2 | |
cx25821: fix bad whitespacing
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Kconfig.staging | 36 | ||||
| -rw-r--r-- | v4l/Makefile.staging | 19 |
2 files changed, 55 insertions, 0 deletions
diff --git a/v4l/Kconfig.staging b/v4l/Kconfig.staging index b8fbc9dcc..45bfeb002 100644 --- a/v4l/Kconfig.staging +++ b/v4l/Kconfig.staging @@ -61,6 +61,42 @@ config VIDEO_GO7007_USB_S2250_BOARD To compile this driver as a module, choose M here: the module will be called s2250. + +config VIDEO_CX25821 + tristate "Conexant cx25821 support" + depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT + select I2C_ALGOBIT + select VIDEO_BTCX + select VIDEO_TVEEPROM + select VIDEO_IR + select VIDEOBUF_DVB + select VIDEOBUF_DMA_SG + select VIDEO_CX25840 + select VIDEO_CX2341X + ---help--- + This is a video4linux driver for Conexant 25821 based + TV cards. + + To compile this driver as a module, choose M here: the + module will be called cx25821 + +config VIDEO_CX25821_ALSA + tristate "Conexant 25821 DMA audio support" + depends on VIDEO_CX25821 && SND && EXPERIMENTAL + select SND_PCM + ---help--- + This is a video4linux driver for direct (DMA) audio on + Conexant 25821 based capture cards using ALSA. + + It only works with boards with function 01 enabled. + To check if your board supports, use lspci -n. + If supported, you should see 14f1:8801 or 14f1:8811 + PCI device. + + To compile this driver as a module, choose M here: the + module will be called cx25821-alsa. + + endmenu endif # STAGING diff --git a/v4l/Makefile.staging b/v4l/Makefile.staging index b8dca80f0..77ba6a9fa 100644 --- a/v4l/Makefile.staging +++ b/v4l/Makefile.staging @@ -37,3 +37,22 @@ staging-install install-staging:: install -d $(KDIRA)/$$dir; \ for i in $$files;do if [ -e $$i ]; then echo -n "$$i "; \ install -m 644 -c $$i $(KDIRA)/$$dir; fi; done; echo; + +# From drivers/staging/cx25821/Makefile + +cx25821-objs := cx25821-core.o cx25821-cards.o cx25821-i2c.o cx25821-gpio.o \ + cx25821-medusa-video.o cx25821-video.o cx25821-video0.o cx25821-video1.o \ + cx25821-video2.o cx25821-video3.o cx25821-video4.o cx25821-video5.o \ + cx25821-video6.o cx25821-video7.o cx25821-vidups9.o cx25821-vidups10.o \ + cx25821-audups11.o cx25821-video-upstream.o cx25821-video-upstream-ch2.o \ + cx25821-audio-upstream.o cx25821-videoioctl.o + +obj-$(CONFIG_VIDEO_CX25821) += cx25821.o +obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o + +EXTRA_CFLAGS += -Idrivers/media/video +EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core +EXTRA_CFLAGS += -Idrivers/media/dvb/frontends + +EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m) + |