[media] bt8xx: move analog TV part to be together with DTV one

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
mariux64 · Aug 15, 2012 · 68de959 · 68de959
1 parent 0aa77f6
commit 68de959
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 45 deletions.
diff --git a/drivers/media/pci/bt8xx/Kconfig b/drivers/media/pci/bt8xx/Kconfig
@@ -1,5 +1,26 @@
+config VIDEO_BT848
+	tristate "BT848 Video For Linux"
+	depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2
+	select I2C_ALGOBIT
+	select VIDEO_BTCX
+	select VIDEOBUF_DMA_SG
+	depends on RC_CORE
+	select VIDEO_TUNER
+	select VIDEO_TVEEPROM
+	select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO
+	select VIDEO_TVAUDIO if VIDEO_HELPER_CHIPS_AUTO
+	select VIDEO_TDA7432 if VIDEO_HELPER_CHIPS_AUTO
+	select VIDEO_SAA6588 if VIDEO_HELPER_CHIPS_AUTO
+	---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 DVB_BT8XX
-	tristate "BT8xx based PCI cards"
+	tristate "DVB/ATSC Support for bt878 based TV cards"
 	depends on DVB_CORE && PCI && I2C && VIDEO_BT848
 	select DVB_MT352 if !DVB_FE_CUSTOMISE
 	select DVB_SP887X if !DVB_FE_CUSTOMISE

diff --git a/drivers/media/pci/bt8xx/Makefile b/drivers/media/pci/bt8xx/Makefile
@@ -1,6 +1,11 @@
+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 bttv-audio-hook.o
+
+obj-$(CONFIG_VIDEO_BT848) += bttv.o
 obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
 
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
-ccflags-y += -Idrivers/media/video/bt8xx
+ccflags-y += -Idrivers/media/video
 ccflags-y += -Idrivers/media/tuners
diff --git a/drivers/media/video/bt8xx/bt848.h → drivers/media/pci/bt8xx/bt848.h b/drivers/media/video/bt8xx/bt848.h → drivers/media/pci/bt8xx/bt848.h
diff --git a/drivers/media/video/bt8xx/bttv-audio-hook.c → drivers/media/pci/bt8xx/bttv-audio-hook.c b/drivers/media/video/bt8xx/bttv-audio-hook.c → drivers/media/pci/bt8xx/bttv-audio-hook.c
diff --git a/drivers/media/video/bt8xx/bttv-audio-hook.h → drivers/media/pci/bt8xx/bttv-audio-hook.h b/drivers/media/video/bt8xx/bttv-audio-hook.h → drivers/media/pci/bt8xx/bttv-audio-hook.h
diff --git a/drivers/media/video/bt8xx/bttv-cards.c → drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c → drivers/media/pci/bt8xx/bttv-cards.c
diff --git a/drivers/media/video/bt8xx/bttv-driver.c → drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c → drivers/media/pci/bt8xx/bttv-driver.c
diff --git a/drivers/media/video/bt8xx/bttv-gpio.c → drivers/media/pci/bt8xx/bttv-gpio.c b/drivers/media/video/bt8xx/bttv-gpio.c → drivers/media/pci/bt8xx/bttv-gpio.c
diff --git a/drivers/media/video/bt8xx/bttv-i2c.c → drivers/media/pci/bt8xx/bttv-i2c.c b/drivers/media/video/bt8xx/bttv-i2c.c → drivers/media/pci/bt8xx/bttv-i2c.c
diff --git a/drivers/media/video/bt8xx/bttv-if.c → drivers/media/pci/bt8xx/bttv-if.c b/drivers/media/video/bt8xx/bttv-if.c → drivers/media/pci/bt8xx/bttv-if.c
diff --git a/drivers/media/video/bt8xx/bttv-input.c → drivers/media/pci/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c → drivers/media/pci/bt8xx/bttv-input.c
diff --git a/drivers/media/video/bt8xx/bttv-risc.c → drivers/media/pci/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c → drivers/media/pci/bt8xx/bttv-risc.c
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c → drivers/media/pci/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c → drivers/media/pci/bt8xx/bttv-vbi.c
diff --git a/drivers/media/video/bt8xx/bttv.h → drivers/media/pci/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h → drivers/media/pci/bt8xx/bttv.h
diff --git a/drivers/media/video/bt8xx/bttvp.h → drivers/media/pci/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h → drivers/media/pci/bt8xx/bttvp.h
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
@@ -619,8 +619,6 @@ menuconfig V4L_PCI_DRIVERS
 
 if V4L_PCI_DRIVERS
 
-source "drivers/media/video/bt8xx/Kconfig"
-
 source "drivers/media/video/cx18/Kconfig"
 
 source "drivers/media/video/cx23885/Kconfig"

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
@@ -87,7 +87,6 @@ obj-$(CONFIG_SOC_CAMERA_TW9910)		+= tw9910.o
 
 # And now the v4l2 drivers:
 
-obj-$(CONFIG_VIDEO_BT848) += bt8xx/
 obj-$(CONFIG_VIDEO_ZORAN) += zoran/
 obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o
 obj-$(CONFIG_VIDEO_BWQCAM) += bw-qcam.o

diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
diff --git a/drivers/media/video/bt8xx/Makefile b/drivers/media/video/bt8xx/Makefile