diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-02-06 07:57:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-08 16:11:25 -0200 |
| commit | f1c50f2489f40494658a6b7326bd6d5a26f72711 (patch) | |
| tree | 69af5dd2ec1c65bea75976c51c3672e80fced0c1 | |
| parent | 625958207752519bd0e49d0dcdde61a20ac081b3 (diff) | |
| download | talos-op-linux-f1c50f2489f40494658a6b7326bd6d5a26f72711.tar.gz talos-op-linux-f1c50f2489f40494658a6b7326bd6d5a26f72711.zip | |
[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>
| -rw-r--r-- | drivers/media/common/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/media/common/Makefile | 1 | ||||
| -rw-r--r-- | drivers/media/common/btcx-risc.c (renamed from drivers/media/i2c/btcx-risc.c) | 0 | ||||
| -rw-r--r-- | drivers/media/common/btcx-risc.h (renamed from drivers/media/i2c/btcx-risc.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/media/i2c/Makefile | 1 | ||||
| -rw-r--r-- | drivers/media/pci/bt8xx/Makefile | 1 | ||||
| -rw-r--r-- | drivers/media/pci/cx23885/Makefile | 1 | ||||
| -rw-r--r-- | drivers/media/pci/cx25821/Makefile | 1 | ||||
| -rw-r--r-- | drivers/media/pci/cx88/Makefile | 1 |
10 files changed, 9 insertions, 5 deletions
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig index dfac52f312cf..28c8a602e7ef 100644 --- a/drivers/media/common/Kconfig +++ b/drivers/media/common/Kconfig @@ -8,6 +8,10 @@ comment "common driver options" config VIDEO_CX2341X tristate +config VIDEO_BTCX + depends on PCI + tristate + source "drivers/media/common/b2c2/Kconfig" source "drivers/media/common/saa7146/Kconfig" source "drivers/media/common/siano/Kconfig" diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile index 9b8ea4fae06f..cfe34499d993 100644 --- a/drivers/media/common/Makefile +++ b/drivers/media/common/Makefile @@ -1,2 +1,3 @@ obj-y += b2c2/ saa7146/ siano/ obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o +obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o diff --git a/drivers/media/i2c/btcx-risc.c b/drivers/media/common/btcx-risc.c index ac1b2687a20d..ac1b2687a20d 100644 --- a/drivers/media/i2c/btcx-risc.c +++ b/drivers/media/common/btcx-risc.c diff --git a/drivers/media/i2c/btcx-risc.h b/drivers/media/common/btcx-risc.h index f8bc6e8e7b51..f8bc6e8e7b51 100644 --- a/drivers/media/i2c/btcx-risc.h +++ b/drivers/media/common/btcx-risc.h diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 97f14c24a40c..cd2b17148ad6 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -2,10 +2,6 @@ # Generic video config states # -config VIDEO_BTCX - depends on PCI - tristate - config VIDEO_TVEEPROM tristate depends on I2C diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile index 3a8334f205f3..3691e70f4e75 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -63,6 +63,5 @@ obj-$(CONFIG_VIDEO_S5C73M3) += s5c73m3/ obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o obj-$(CONFIG_VIDEO_AS3645A) += as3645a.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_IR_I2C) += ir-kbd-i2c.o diff --git a/drivers/media/pci/bt8xx/Makefile b/drivers/media/pci/bt8xx/Makefile index 5f06597c6a6e..f9fe7c4e7d53 100644 --- a/drivers/media/pci/bt8xx/Makefile +++ b/drivers/media/pci/bt8xx/Makefile @@ -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-frontends ccflags-y += -Idrivers/media/i2c +ccflags-y += -Idrivers/media/common ccflags-y += -Idrivers/media/tuners diff --git a/drivers/media/pci/cx23885/Makefile b/drivers/media/pci/cx23885/Makefile index a2cbdcf15a8c..2a2cafb8cf5b 100644 --- a/drivers/media/pci/cx23885/Makefile +++ b/drivers/media/pci/cx23885/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_VIDEO_CX23885) += cx23885.o obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o ccflags-y += -Idrivers/media/i2c +ccflags-y += -Idrivers/media/common ccflags-y += -Idrivers/media/tuners ccflags-y += -Idrivers/media/dvb-core ccflags-y += -Idrivers/media/dvb-frontends diff --git a/drivers/media/pci/cx25821/Makefile b/drivers/media/pci/cx25821/Makefile index 5bf3ea4c1556..caa32b7b51f8 100644 --- a/drivers/media/pci/cx25821/Makefile +++ b/drivers/media/pci/cx25821/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_VIDEO_CX25821) += cx25821.o obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o ccflags-y += -Idrivers/media/i2c +ccflags-y += -Idrivers/media/common ccflags-y += -Idrivers/media/tuners ccflags-y += -Idrivers/media/dvb-core ccflags-y += -Idrivers/media/dvb-frontends diff --git a/drivers/media/pci/cx88/Makefile b/drivers/media/pci/cx88/Makefile index d3679c3ee248..8619c1becee2 100644 --- a/drivers/media/pci/cx88/Makefile +++ b/drivers/media/pci/cx88/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o ccflags-y += -Idrivers/media/i2c +ccflags-y += -Idrivers/media/common ccflags-y += -Idrivers/media/tuners ccflags-y += -Idrivers/media/dvb-core ccflags-y += -Idrivers/media/dvb-frontends |
