V4L/DVB (12832): tm6000: allow compilation of tm6000-alsa module

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/tm6000/Kconfig b/drivers/staging/tm6000/Kconfig
index 5e0c98189cc7067f22cf938d1aa5501588bc88a5..5d36df472edb89ee7c78d391bd76bf5d0e0fc578 100644 (file)
--- a/drivers/staging/tm6000/Kconfig
+++ b/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/drivers/staging/tm6000/Makefile b/drivers/staging/tm6000/Makefile
index e4297cae93e22539ba97868ecfd2a534c3d807f3..25aefe74dddc832425f90483897f8e610c4294e0 100644 (file)
--- a/drivers/staging/tm6000/Makefile
+++ b/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/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
index 35e7d63f00fb052702537bf1831108fd8f572d07..179885a193e6e26336f4f414d897bd333e374c7b 100644 (file)
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/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);