diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-01-11 14:19:45 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-01-11 14:19:45 -0200 |
| commit | 1eee0178b5f14b0044c51bd9c72856e8a5e1038b (patch) | |
| tree | 89822770f5829de24cd324a4c0516e1447e49d7c | |
| parent | d781bec246431b91a4af7804d95831f4c4b28d55 (diff) | |
| download | mediapointer-dvb-s2-1eee0178b5f14b0044c51bd9c72856e8a5e1038b.tar.gz mediapointer-dvb-s2-1eee0178b5f14b0044c51bd9c72856e8a5e1038b.tar.bz2 | |
tm6000: allow compilation of tm6000-alsa module
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/drivers/staging/tm6000/Kconfig | 18 | ||||
| -rw-r--r-- | linux/drivers/staging/tm6000/Makefile | 1 | ||||
| -rw-r--r-- | linux/drivers/staging/tm6000/tm6000-core.c | 3 |
3 files changed, 18 insertions, 4 deletions
diff --git a/linux/drivers/staging/tm6000/Kconfig b/linux/drivers/staging/tm6000/Kconfig index 5e0c98189..5d36df472 100644 --- a/linux/drivers/staging/tm6000/Kconfig +++ b/linux/drivers/staging/tm6000/Kconfig @@ -1,11 +1,12 @@ config VIDEO_TM6000 - tristate "TV Master TM5600/6000 driver" + tristate "TV Master TM5600/6000/6010 driver" + depends on EXPERIMENTAL select VIDEO_V4L2 select VIDEO_TUNER select TUNER_XC2028 select VIDEOBUF_VMALLOC help - Support for TM5600/TM6000 USB Device + Support for TM5600/TM6000/TM6010 USB Device Since these cards have no MPEG decoder onboard, they transmit only compressed MPEG data over the usb bus, so you need @@ -13,9 +14,20 @@ config VIDEO_TM6000 Say Y if you own such a device and want to use it. +config VIDEO_TM6000_ALSA + tristate "TV Master TM5600/6000/6010 audio support" + depends on VIDEO_TM6000 && SND && EXPERIMENTAL + select SND_PCM + ---help--- + This is a video4linux driver for direct (DMA) audio for + TM5600/TM6000/TM6010 USB Devices. + + To compile this driver as a module, choose M here: the + module will be called tm6000-alsa. + config VIDEO_TM6000_DVB bool "DVB Support for tm6000 based TV cards" - depends on VIDEO_TM6000 && DVB_CORE + depends on VIDEO_TM6000 && DVB_CORE && EXPERIMENTAL select DVB_ZL10353 ---help--- This adds support for DVB cards based on the tm5600/tm6000 chip. diff --git a/linux/drivers/staging/tm6000/Makefile b/linux/drivers/staging/tm6000/Makefile index e4297cae9..25aefe74d 100644 --- a/linux/drivers/staging/tm6000/Makefile +++ b/linux/drivers/staging/tm6000/Makefile @@ -10,5 +10,6 @@ tm6000-objs += tm6000-dvb.o \ endif obj-$(CONFIG_VIDEO_TM6000) += tm6000.o +obj-$(CONFIG_VIDEO_TM6000_ALSA) += tm6000-alsa.o EXTRA_CFLAGS = -Idrivers/media/video diff --git a/linux/drivers/staging/tm6000/tm6000-core.c b/linux/drivers/staging/tm6000/tm6000-core.c index 67fd50078..e6075f4c1 100644 --- a/linux/drivers/staging/tm6000/tm6000-core.c +++ b/linux/drivers/staging/tm6000/tm6000-core.c @@ -492,7 +492,7 @@ int tm6000_init (struct tm6000_core *dev) return 0; } -int tm6000_set_audio_bitrate (struct tm6000_core *dev, int bitrate) +int tm6000_set_audio_bitrate(struct tm6000_core *dev, int bitrate) { int val; @@ -516,3 +516,4 @@ printk("Original value=%d\n",val); return val; } +EXPORT_SYMBOL_GPL(tm6000_set_audio_bitrate); |