backport tuners move patch from -git

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Due to the feedback I got, I've changed the -git patch. This needs to be
reflected also at -hg tree.

kernel-sync:

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

14 files changed, 26 insertions, 22 deletions

diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig
index 09468d8c7..b5664927d 100644
--- a/linux/drivers/media/Kconfig
+++ b/linux/drivers/media/Kconfig
@@ -89,8 +89,15 @@ config DVB_CORE
 
 	  If unsure say N.
 
+config VIDEO_MEDIA
+	tristate
+	default DVB_CORE || VIDEO_DEV
+	depends on DVB_CORE || VIDEO_DEV
+
 comment "Multimedia drivers"
 
+source "drivers/media/common/Kconfig"
+
 #
 # Tuner drivers for DVB and V4L
 #
diff --git a/linux/drivers/media/Makefile b/linux/drivers/media/Makefile
index b6c5b35cc..73f742c7e 100644
--- a/linux/drivers/media/Makefile
+++ b/linux/drivers/media/Makefile
@@ -2,6 +2,10 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-y := common/
-obj-$(CONFIG_VIDEO_DEV) += radio/ video/
+obj-$(CONFIG_VIDEO_MEDIA) += common/
+
+# Since hybrid devices are here, should be compiled if DVB and/or V4L
+obj-$(CONFIG_VIDEO_MEDIA) += video/
+
+obj-$(CONFIG_VIDEO_DEV) += radio/
 obj-$(CONFIG_DVB_CORE)  += dvb/
diff --git a/linux/drivers/media/common/Makefile b/linux/drivers/media/common/Makefile
index f57654620..8e7448230 100644
--- a/linux/drivers/media/common/Makefile
+++ b/linux/drivers/media/common/Makefile
@@ -1,5 +1,7 @@
+saa7146-objs    := saa7146_i2c.o saa7146_core.o
+saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
 ir-common-objs  := ir-functions.o ir-keymaps.o
 
+obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
+obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
 obj-$(CONFIG_VIDEO_IR) += ir-common.o
-
-obj-y += tuners/
diff --git a/linux/drivers/media/video/saa7146/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c
index 973989dd4..973989dd4 100644
--- a/linux/drivers/media/video/saa7146/saa7146_core.c
+++ b/linux/drivers/media/common/saa7146_core.c
diff --git a/linux/drivers/media/video/saa7146/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c
index ac035cbcf..ac035cbcf 100644
--- a/linux/drivers/media/video/saa7146/saa7146_fops.c
+++ b/linux/drivers/media/common/saa7146_fops.c
diff --git a/linux/drivers/media/video/saa7146/saa7146_hlp.c b/linux/drivers/media/common/saa7146_hlp.c
index c0f3f51f9..c0f3f51f9 100644
--- a/linux/drivers/media/video/saa7146/saa7146_hlp.c
+++ b/linux/drivers/media/common/saa7146_hlp.c
diff --git a/linux/drivers/media/video/saa7146/saa7146_i2c.c b/linux/drivers/media/common/saa7146_i2c.c
index a2447ff60..a2447ff60 100644
--- a/linux/drivers/media/video/saa7146/saa7146_i2c.c
+++ b/linux/drivers/media/common/saa7146_i2c.c
diff --git a/linux/drivers/media/video/saa7146/saa7146_vbi.c b/linux/drivers/media/common/saa7146_vbi.c
index 9a03df7fc..9a03df7fc 100644
--- a/linux/drivers/media/video/saa7146/saa7146_vbi.c
+++ b/linux/drivers/media/common/saa7146_vbi.c
diff --git a/linux/drivers/media/video/saa7146/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c
index b68c6288b..b68c6288b 100644
--- a/linux/drivers/media/video/saa7146/saa7146_video.c
+++ b/linux/drivers/media/common/saa7146_video.c
diff --git a/linux/drivers/media/dvb/frontends/Kconfig b/linux/drivers/media/dvb/frontends/Kconfig
index 93d0ecb16..5a59493a8 100644
--- a/linux/drivers/media/dvb/frontends/Kconfig
+++ b/linux/drivers/media/dvb/frontends/Kconfig
@@ -370,6 +370,15 @@ config DVB_TUNER_DIB0070
 	  This device is only used inside a SiP called togther with a
 	  demodulator for now.
 
+config DVB_TUNER_XC5000
+	tristate "Xceive XC5000 silicon tuner"
+	depends on I2C
+	default m if DVB_FE_CUSTOMISE
+	help
+	  A driver for the silicon tuner XC5000 from Xceive.
+	  This device is only used inside a SiP called togther with a
+	  demodulator for now.
+
 comment "SEC control devices for DVB-S"
 	depends on DVB_CORE
 
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig
index 98d3bc1f6..98ad43799 100644
--- a/linux/drivers/media/video/Kconfig
+++ b/linux/drivers/media/video/Kconfig
@@ -686,8 +686,6 @@ config VIDEO_MEYE
 
 source "drivers/media/video/saa7134/Kconfig"
 
-source "drivers/media/video/saa7146/Kconfig"
-
 config VIDEO_MXB
 	tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
 	depends on PCI && VIDEO_V4L1 && I2C
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index 55c30b507..29139b53d 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/drivers/media/video/Makefile
@@ -137,8 +137,6 @@ obj-$(CONFIG_SOC_CAMERA_MT9V022)	+= mt9v022.o
 
 obj-$(CONFIG_VIDEO_AU0828) += au0828/
 
-obj-$(CONFIG_VIDEO_SAA7146) += saa7146/
-
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
 EXTRA_CFLAGS += -Idrivers/media/common/tuners
diff --git a/linux/drivers/media/video/saa7146/Kconfig b/linux/drivers/media/video/saa7146/Kconfig
deleted file mode 100644
index 769c6f814..000000000
--- a/linux/drivers/media/video/saa7146/Kconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-config VIDEO_SAA7146
-	tristate
-	depends on I2C && PCI
-
-config VIDEO_SAA7146_VV
-	tristate
-	depends on VIDEO_V4L2
-	select VIDEOBUF_DMA_SG
-	select VIDEO_SAA7146
diff --git a/linux/drivers/media/video/saa7146/Makefile b/linux/drivers/media/video/saa7146/Makefile
deleted file mode 100644
index 3219b00a8..000000000
--- a/linux/drivers/media/video/saa7146/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-saa7146-objs    := saa7146_i2c.o saa7146_core.o
-saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
-
-obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
-obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o