---

yaml --- r: 192691 b: refs/heads/master c: 44351aa h: refs/heads/master i: 192689: 5cac55d 192687: c108b2d v: v3
git-mirror · May 18, 2010 · 5c06236 · 5c06236
1 parent f151354
commit 5c06236
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ca30c524e7c6f21d05577f2ffe6fc1e632f372a
+refs/heads/master: 44351aa0ee98b745986c94e139e0b1fdbd270015
diff --git a/trunk/drivers/staging/tm6000/Kconfig b/trunk/drivers/staging/tm6000/Kconfig
@@ -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.
diff --git a/trunk/drivers/staging/tm6000/Makefile b/trunk/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/trunk/drivers/staging/tm6000/tm6000-core.c b/trunk/drivers/staging/tm6000/tm6000-core.c
@@ -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;
 
@@ -504,3 +504,4 @@ printk("Original value=%d\n",val);
 
 	return val;
 }
+EXPORT_SYMBOL_GPL(tm6000_set_audio_bitrate);