Merge /home/v4l/v4l/patchwork

diff --git a/MAINTAINERS b/MAINTAINERS
index 7451f6ddc3a4607f686025b0ee284aceea0672b5..f4b3aa8f4f4c62adf699c90012f05909a70dbe16 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3058,6 +3058,14 @@ T:       git git://git.alsa-project.org/alsa-kernel.git
 S:     Maintained
 F:     sound/firewire/
 
+FIREWIRE MEDIA DRIVERS (firedtv)
+M:     Stefan Richter <stefanr@s5r6.in-berlin.de>
+L:     linux-media@vger.kernel.org
+L:     linux1394-devel@lists.sourceforge.net
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
+S:     Maintained
+F:     drivers/media/firewire/
+
 FIREWIRE SBP-2 TARGET
 M:     Chris Boot <bootc@bootc.net>
 L:     linux-scsi@vger.kernel.org
@@ -4117,6 +4125,22 @@ S:       Maintained
 F:     Documentation/hwmon/it87
 F:     drivers/hwmon/it87.c
 
+IT913X MEDIA DRIVER
+M:     Malcolm Priestley <tvboxspy@gmail.com>
+L:     linux-media@vger.kernel.org
+W:     http://linuxtv.org/
+Q:     http://patchwork.linuxtv.org/project/linux-media/list/
+S:     Maintained
+F:     drivers/media/usb/dvb-usb-v2/it913x*
+
+IT913X FE MEDIA DRIVER
+M:     Malcolm Priestley <tvboxspy@gmail.com>
+L:     linux-media@vger.kernel.org
+W:     http://linuxtv.org/
+Q:     http://patchwork.linuxtv.org/project/linux-media/list/
+S:     Maintained
+F:     drivers/media/dvb-frontends/it913x-fe*
+
 IVTV VIDEO4LINUX DRIVER
 M:     Andy Walls <awalls@md.metrocast.net>
 L:     ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
@@ -4128,6 +4152,14 @@ F:       Documentation/video4linux/*.ivtv
 F:     drivers/media/pci/ivtv/
 F:     include/linux/ivtv*
 
+IX2505V MEDIA DRIVER
+M:     Malcolm Priestley <tvboxspy@gmail.com>
+L:     linux-media@vger.kernel.org
+W:     http://linuxtv.org/
+Q:     http://patchwork.linuxtv.org/project/linux-media/list/
+S:     Maintained
+F:     drivers/media/dvb-frontends/ix2505v*
+
 JC42.4 TEMPERATURE SENSOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     lm-sensors@lm-sensors.org
@@ -4572,6 +4604,14 @@ S:       Maintained
 F:     Documentation/hwmon/lm90
 F:     drivers/hwmon/lm90.c
 
+LME2510 MEDIA DRIVER
+M:     Malcolm Priestley <tvboxspy@gmail.com>
+L:     linux-media@vger.kernel.org
+W:     http://linuxtv.org/
+Q:     http://patchwork.linuxtv.org/project/linux-media/list/
+S:     Maintained
+F:     drivers/media/usb/dvb-usb-v2/lmedm04*
+
 LOCKDEP AND LOCKSTAT
 M:     Peter Zijlstra <peterz@infradead.org>
 M:     Ingo Molnar <mingo@redhat.com>
@@ -4662,6 +4702,14 @@ W:       http://www.tazenda.demon.co.uk/phil/linux-hp
 S:     Maintained
 F:     arch/m68k/hp300/
 
+M88RS2000 MEDIA DRIVER
+M:     Malcolm Priestley <tvboxspy@gmail.com>
+L:     linux-media@vger.kernel.org
+W:     http://linuxtv.org/
+Q:     http://patchwork.linuxtv.org/project/linux-media/list/
+S:     Maintained
+F:     drivers/media/dvb-frontends/m88rs2000*
+
 MAC80211
 M:     Johannes Berg <johannes@sipsolutions.net>
 L:     linux-wireless@vger.kernel.org

diff --git a/drivers/media/common/siano/Kconfig b/drivers/media/common/siano/Kconfig
index 3cb7823ab31bda9e675a5677d1fe100983d198fc..68f0f604678ecd33e197539001c0097b6156fd43 100644 (file)
--- a/drivers/media/common/siano/Kconfig
+++ b/drivers/media/common/siano/Kconfig
@@ -5,6 +5,7 @@
 config SMS_SIANO_MDTV
        tristate
        depends on DVB_CORE && HAS_DMA
+       depends on !RC_CORE || RC_CORE
        depends on SMS_USB_DRV || SMS_SDIO_DRV
        default y
 

diff --git a/drivers/media/common/siano/Makefile b/drivers/media/common/siano/Makefile
index 0e6f5e9271371b8dc25969300f6eaffbc56592b7..9e7fdf24a6b79d4fcd8727a56a1d28aa6b164bb1 100644 (file)
--- a/drivers/media/common/siano/Makefile
+++ b/drivers/media/common/siano/Makefile
@@ -1,7 +1,10 @@
 smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o
 
 obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.o
-obj-$(CONFIG_SMS_SIANO_RC) += smsir.o
+
+ifeq ($(CONFIG_SMS_SIANO_RC),y)
+  obj-$(CONFIG_SMS_SIANO_MDTV) += smsir.o
+endif
 
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += $(extra-cflags-y) $(extra-cflags-m)

diff --git a/drivers/media/mmc/siano/Kconfig b/drivers/media/mmc/siano/Kconfig
index 69f8061602a4ad822cc615af63241637c158a843..aa05ad3c1ccbedee60bcbece92e4acda8322ee17 100644 (file)
--- a/drivers/media/mmc/siano/Kconfig
+++ b/drivers/media/mmc/siano/Kconfig
@@ -4,7 +4,7 @@
 
 config SMS_SDIO_DRV
        tristate "Siano SMS1xxx based MDTV via SDIO interface"
-       depends on DVB_CORE && RC_CORE && HAS_DMA
+       depends on DVB_CORE && HAS_DMA
        depends on MMC
        select MEDIA_COMMON_OPTIONS
        ---help---

diff --git a/drivers/media/usb/siano/Kconfig b/drivers/media/usb/siano/Kconfig
index b2c229e73952f701dbb44f51c6e784dc81454318..5afbd9a4b55c985f2cbf3b118060767ebebb4f9c 100644 (file)
--- a/drivers/media/usb/siano/Kconfig
+++ b/drivers/media/usb/siano/Kconfig
@@ -4,7 +4,7 @@
 
 config SMS_USB_DRV
        tristate "Siano SMS1xxx based MDTV receiver"
-       depends on DVB_CORE && RC_CORE && HAS_DMA
+       depends on DVB_CORE && HAS_DMA
        select MEDIA_COMMON_OPTIONS
        ---help---
          Choose if you would like to have Siano's support for USB interface