Skip to content

Commit

Permalink
V4L/DVB (12832): tm6000: allow compilation of tm6000-alsa module
Browse files Browse the repository at this point in the history
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed May 18, 2010
1 parent 7ca30c5 commit 44351aa
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
18 changes: 15 additions & 3 deletions drivers/staging/tm6000/Kconfig
Original file line number Diff line number Diff line change
@@ -1,21 +1,33 @@
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
an external software decoder to watch TV on your computer.

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.
1 change: 1 addition & 0 deletions drivers/staging/tm6000/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion drivers/staging/tm6000/tm6000-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,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;

Expand All @@ -504,3 +504,4 @@ printk("Original value=%d\n",val);

return val;
}
EXPORT_SYMBOL_GPL(tm6000_set_audio_bitrate);

0 comments on commit 44351aa

Please sign in to comment.