hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] btcx-risc: move from media/i2c to media/common 

The btcx-risc module is a helper module for bttv/conexant based TV cards.
It isn't an i2c module at all, instead it should be in common since it is
used by 4 pci drivers.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2013-02-06 07:57:57 -03:00 committed by Mauro Carvalho Chehab
parent 6259582077
commit f1c50f2489
10 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/common/Kconfig
View File

@ -8,6 +8,10 @@ comment "common driver options"
config VIDEO_CX2341X config VIDEO_CX2341X
tristate tristate
config VIDEO_BTCX
depends on PCI
tristate
source "drivers/media/common/b2c2/Kconfig" source "drivers/media/common/b2c2/Kconfig"
source "drivers/media/common/saa7146/Kconfig" source "drivers/media/common/saa7146/Kconfig"
source "drivers/media/common/siano/Kconfig" source "drivers/media/common/siano/Kconfig"

1
drivers/media/common/Makefile
View File

@ -1,2 +1,3 @@
obj-y += b2c2/ saa7146/ siano/ obj-y += b2c2/ saa7146/ siano/
obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o

0
drivers/media/i2c/btcx-risc.c → drivers/media/common/btcx-risc.c
View File

0
drivers/media/i2c/btcx-risc.h → drivers/media/common/btcx-risc.h
View File

4
drivers/media/i2c/Kconfig
View File

@ -2,10 +2,6 @@
# Generic video config states # Generic video config states
# #
config VIDEO_BTCX
depends on PCI
tristate
config VIDEO_TVEEPROM config VIDEO_TVEEPROM
tristate tristate
depends on I2C depends on I2C

1
drivers/media/i2c/Makefile
View File

@ -63,6 +63,5 @@ obj-$(CONFIG_VIDEO_S5C73M3) += s5c73m3/
obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o
obj-$(CONFIG_VIDEO_AS3645A) += as3645a.o obj-$(CONFIG_VIDEO_AS3645A) += as3645a.o
obj-$(CONFIG_VIDEO_SMIAPP_PLL) += smiapp-pll.o obj-$(CONFIG_VIDEO_SMIAPP_PLL) += smiapp-pll.o
obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o
obj-$(CONFIG_VIDEO_AK881X) += ak881x.o obj-$(CONFIG_VIDEO_AK881X) += ak881x.o
obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o

1
drivers/media/pci/bt8xx/Makefile
View File

@ -8,4 +8,5 @@ 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-core
ccflags-y += -Idrivers/media/dvb-frontends ccflags-y += -Idrivers/media/dvb-frontends
ccflags-y += -Idrivers/media/i2c ccflags-y += -Idrivers/media/i2c
ccflags-y += -Idrivers/media/common
ccflags-y += -Idrivers/media/tuners ccflags-y += -Idrivers/media/tuners

1
drivers/media/pci/cx23885/Makefile
View File

@ -8,6 +8,7 @@ obj-$(CONFIG_VIDEO_CX23885) += cx23885.o
obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
ccflags-y += -Idrivers/media/i2c ccflags-y += -Idrivers/media/i2c
ccflags-y += -Idrivers/media/common
ccflags-y += -Idrivers/media/tuners ccflags-y += -Idrivers/media/tuners
ccflags-y += -Idrivers/media/dvb-core ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb-frontends ccflags-y += -Idrivers/media/dvb-frontends

1
drivers/media/pci/cx25821/Makefile
View File

@ -8,6 +8,7 @@ obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
ccflags-y += -Idrivers/media/i2c ccflags-y += -Idrivers/media/i2c
ccflags-y += -Idrivers/media/common
ccflags-y += -Idrivers/media/tuners ccflags-y += -Idrivers/media/tuners
ccflags-y += -Idrivers/media/dvb-core ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb-frontends ccflags-y += -Idrivers/media/dvb-frontends

1
drivers/media/pci/cx88/Makefile
View File

@ -11,6 +11,7 @@ obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
ccflags-y += -Idrivers/media/i2c ccflags-y += -Idrivers/media/i2c
ccflags-y += -Idrivers/media/common
ccflags-y += -Idrivers/media/tuners ccflags-y += -Idrivers/media/tuners
ccflags-y += -Idrivers/media/dvb-core ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb-frontends ccflags-y += -Idrivers/media/dvb-frontends