---

yaml --- r: 357537 b: refs/heads/master c: f1c50f2 h: refs/heads/master i: 357535: 77a7004 v: v3
git-mirror · Feb 8, 2013 · 882e674 · 882e674
1 parent af8677a
commit 882e674
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 625958207752519bd0e49d0dcdde61a20ac081b3
+refs/heads/master: f1c50f2489f40494658a6b7326bd6d5a26f72711
diff --git a/trunk/drivers/media/common/Kconfig b/trunk/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/trunk/drivers/media/common/Makefile b/trunk/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/trunk/drivers/media/i2c/btcx-risc.c → trunk/drivers/media/common/btcx-risc.c b/trunk/drivers/media/i2c/btcx-risc.c → trunk/drivers/media/common/btcx-risc.c
diff --git a/trunk/drivers/media/i2c/btcx-risc.h → trunk/drivers/media/common/btcx-risc.h b/trunk/drivers/media/i2c/btcx-risc.h → trunk/drivers/media/common/btcx-risc.h
diff --git a/trunk/drivers/media/i2c/Kconfig b/trunk/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/trunk/drivers/media/i2c/Makefile b/trunk/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/trunk/drivers/media/pci/bt8xx/Makefile b/trunk/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/trunk/drivers/media/pci/cx23885/Makefile b/trunk/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/trunk/drivers/media/pci/cx25821/Makefile b/trunk/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/trunk/drivers/media/pci/cx88/Makefile b/trunk/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