Merge from manu tree

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

merge:

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

16 files changed, 28 insertions, 30 deletions

diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig
index e9d536e63..762e35670 100644
--- a/linux/drivers/media/video/Kconfig
+++ b/linux/drivers/media/video/Kconfig
@@ -16,31 +16,7 @@ config VIDEO_ADV_DEBUG
 	  V4L devices.
 	  In doubt, say N.
 
-config VIDEO_BT848
-	tristate "BT848 Video For Linux"
-	depends on VIDEO_DEV && PCI && I2C
-	select I2C_ALGOBIT
-	select FW_LOADER
-	select VIDEO_BTCX
-	select VIDEO_BUF
-	select VIDEO_IR
-	select VIDEO_TUNER
-	select VIDEO_TVEEPROM
-	select VIDEO_MSP3400
-	---help---
-	  Support for BT848 based frame grabber/overlay boards. This includes
-	  the Miro, Hauppauge and STB boards. Please read the material in
-	  <file:Documentation/video4linux/bttv/> for more information.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called bttv.
-
-config VIDEO_BT848_DVB
-	bool "DVB/ATSC Support for bt878 based TV cards"
-	depends on VIDEO_BT848 && DVB_CORE
-	select DVB_BT8XX
-	---help---
-	  This adds support for DVB/ATSC cards based on the BT878 chip.
+source "drivers/media/video/bt8xx/Kconfig"
 
 config VIDEO_SAA6588
 	tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards"
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index 2b88cfdd2..27e7b37b1 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/drivers/media/video/Makefile
@@ -2,9 +2,6 @@
 # Makefile for the video capture/playback device drivers.
 #
 
-bttv-objs	:=	bttv-driver.o bttv-cards.o bttv-if.o \
-			bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o \
-			bttv-input.o
 zoran-objs      :=	zr36120.o zr36120_i2c.o zr36120_mem.o
 zr36067-objs	:=	zoran_procfs.o zoran_device.o \
 			zoran_driver.o zoran_card.o
@@ -15,8 +12,8 @@ msp3400-objs	:=	msp3400-driver.o msp3400-kthreads.o
 
 obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o compat_ioctl32.o
 
-obj-$(CONFIG_VIDEO_BT848) += bttv.o tvaudio.o \
-	tda7432.o tda9875.o ir-kbd-i2c.o
+obj-$(CONFIG_VIDEO_BT848) += bt8xx/
+obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o
 obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o
 
 obj-$(CONFIG_VIDEO_ZR36120) += zoran.o
diff --git a/linux/drivers/media/video/bt8xx/Kconfig b/linux/drivers/media/video/bt8xx/Kconfig
new file mode 100644
index 000000000..085477c12
--- /dev/null
+++ b/linux/drivers/media/video/bt8xx/Kconfig
@@ -0,0 +1,25 @@
+config VIDEO_BT848
+	tristate "BT848 Video For Linux"
+	depends on VIDEO_DEV && PCI && I2C
+	select I2C_ALGOBIT
+	select FW_LOADER
+	select VIDEO_BTCX
+	select VIDEO_BUF
+	select VIDEO_IR
+	select VIDEO_TUNER
+	select VIDEO_TVEEPROM
+	select VIDEO_MSP3400
+	---help---
+	  Support for BT848 based frame grabber/overlay boards. This includes
+	  the Miro, Hauppauge and STB boards. Please read the material in
+	  <file:Documentation/video4linux/bttv/> for more information.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called bttv.
+
+config VIDEO_BT848_DVB
+	bool "DVB/ATSC Support for bt878 based TV cards"
+	depends on VIDEO_BT848 && DVB_CORE
+	select DVB_BT8XX
+	---help---
+	  This adds support for DVB/ATSC cards based on the BT878 chip.
diff --git a/linux/drivers/media/video/bt832.c b/linux/drivers/media/video/bt8xx/bt832.c
index b155bbe91..b155bbe91 100644
--- a/linux/drivers/media/video/bt832.c
+++ b/linux/drivers/media/video/bt8xx/bt832.c
diff --git a/linux/drivers/media/video/bt832.h b/linux/drivers/media/video/bt8xx/bt832.h
index 1ce8fa71f..1ce8fa71f 100644
--- a/linux/drivers/media/video/bt832.h
+++ b/linux/drivers/media/video/bt8xx/bt832.h
diff --git a/linux/drivers/media/video/bt848.h b/linux/drivers/media/video/bt8xx/bt848.h
index 0bcd95303..0bcd95303 100644
--- a/linux/drivers/media/video/bt848.h
+++ b/linux/drivers/media/video/bt8xx/bt848.h
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c
index 47131de0d..47131de0d 100644
--- a/linux/drivers/media/video/bttv-cards.c
+++ b/linux/drivers/media/video/bt8xx/bttv-cards.c
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c
index 0b321480b..0b321480b 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bt8xx/bttv-driver.c
diff --git a/linux/drivers/media/video/bttv-gpio.c b/linux/drivers/media/video/bt8xx/bttv-gpio.c
index 8682662b3..8682662b3 100644
--- a/linux/drivers/media/video/bttv-gpio.c
+++ b/linux/drivers/media/video/bt8xx/bttv-gpio.c
diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bt8xx/bttv-i2c.c
index 87e6d867a..87e6d867a 100644
--- a/linux/drivers/media/video/bttv-i2c.c
+++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c
diff --git a/linux/drivers/media/video/bttv-if.c b/linux/drivers/media/video/bt8xx/bttv-if.c
index d264e0e53..d264e0e53 100644
--- a/linux/drivers/media/video/bttv-if.c
+++ b/linux/drivers/media/video/bt8xx/bttv-if.c
diff --git a/linux/drivers/media/video/bttv-input.c b/linux/drivers/media/video/bt8xx/bttv-input.c
index 8a619ddb1..8a619ddb1 100644
--- a/linux/drivers/media/video/bttv-input.c
+++ b/linux/drivers/media/video/bt8xx/bttv-input.c
diff --git a/linux/drivers/media/video/bttv-risc.c b/linux/drivers/media/video/bt8xx/bttv-risc.c
index 53dfe0f4d..53dfe0f4d 100644
--- a/linux/drivers/media/video/bttv-risc.c
+++ b/linux/drivers/media/video/bt8xx/bttv-risc.c
diff --git a/linux/drivers/media/video/bttv-vbi.c b/linux/drivers/media/video/bt8xx/bttv-vbi.c
index 136218014..136218014 100644
--- a/linux/drivers/media/video/bttv-vbi.c
+++ b/linux/drivers/media/video/bt8xx/bttv-vbi.c
diff --git a/linux/drivers/media/video/bttv.h b/linux/drivers/media/video/bt8xx/bttv.h
index bdc3a19e3..bdc3a19e3 100644
--- a/linux/drivers/media/video/bttv.h
+++ b/linux/drivers/media/video/bt8xx/bttv.h
diff --git a/linux/drivers/media/video/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h
index d5469ad2b..d5469ad2b 100644
--- a/linux/drivers/media/video/bttvp.h
+++ b/linux/drivers/media/video/bt8xx/bttvp.h