From: Manu Abraham Date: Fri, 17 Mar 2006 15:07:22 +0000 (-0300) Subject: V4L/DVB (3539): Move bttv fragments to bt8xx/ X-Git-Tag: v2.6.17-rc1~739^2~29 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faecfb1760325613debd8df9b9374ce4a28c01d9;p=linux-2.6 V4L/DVB (3539): Move bttv fragments to bt8xx/ Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index c622a4da56..b3d3b22d3f 100644 --- a/drivers/media/video/Kconfig +++ b/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 - 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/drivers/media/video/Makefile b/drivers/media/video/Makefile index f2bd4c0c4f..1a56a2d9e2 100644 --- a/drivers/media/video/Makefile +++ b/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/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig new file mode 100644 index 0000000000..085477c126 --- /dev/null +++ b/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 + 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/drivers/media/video/bt832.c b/drivers/media/video/bt8xx/bt832.c similarity index 100% rename from drivers/media/video/bt832.c rename to drivers/media/video/bt8xx/bt832.c diff --git a/drivers/media/video/bt832.h b/drivers/media/video/bt8xx/bt832.h similarity index 100% rename from drivers/media/video/bt832.h rename to drivers/media/video/bt8xx/bt832.h diff --git a/drivers/media/video/bt848.h b/drivers/media/video/bt8xx/bt848.h similarity index 100% rename from drivers/media/video/bt848.h rename to drivers/media/video/bt8xx/bt848.h diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c similarity index 100% rename from drivers/media/video/bttv-cards.c rename to drivers/media/video/bt8xx/bttv-cards.c diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c similarity index 100% rename from drivers/media/video/bttv-driver.c rename to drivers/media/video/bt8xx/bttv-driver.c diff --git a/drivers/media/video/bttv-gpio.c b/drivers/media/video/bt8xx/bttv-gpio.c similarity index 100% rename from drivers/media/video/bttv-gpio.c rename to drivers/media/video/bt8xx/bttv-gpio.c diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bt8xx/bttv-i2c.c similarity index 100% rename from drivers/media/video/bttv-i2c.c rename to drivers/media/video/bt8xx/bttv-i2c.c diff --git a/drivers/media/video/bttv-if.c b/drivers/media/video/bt8xx/bttv-if.c similarity index 100% rename from drivers/media/video/bttv-if.c rename to drivers/media/video/bt8xx/bttv-if.c diff --git a/drivers/media/video/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c similarity index 100% rename from drivers/media/video/bttv-input.c rename to drivers/media/video/bt8xx/bttv-input.c diff --git a/drivers/media/video/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c similarity index 100% rename from drivers/media/video/bttv-risc.c rename to drivers/media/video/bt8xx/bttv-risc.c diff --git a/drivers/media/video/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c similarity index 100% rename from drivers/media/video/bttv-vbi.c rename to drivers/media/video/bt8xx/bttv-vbi.c diff --git a/drivers/media/video/bttv.h b/drivers/media/video/bt8xx/bttv.h similarity index 100% rename from drivers/media/video/bttv.h rename to drivers/media/video/bt8xx/bttv.h diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bt8xx/bttvp.h similarity index 100% rename from drivers/media/video/bttvp.h rename to drivers/media/video/bt8xx/bttvp.h