Commit faecfb17 authored by Manu Abraham's avatar Manu Abraham Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3539): Move bttv fragments to bt8xx/ 



Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 280323dd

drivers/media/video/Kconfig

+1 −25
Original line number Diff line number Diff line
@@ -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"

drivers/media/video/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -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

drivers/media/video/bt8xx/Kconfig

0 → 100644
+25 −0
Original line number Diff line number Diff line 
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.