---

yaml --- r: 357538 b: refs/heads/master c: a393eda h: refs/heads/master v: v3
git-mirror · Feb 8, 2013 · f545262 · f545262
1 parent 882e674
commit f545262
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1c50f2489f40494658a6b7326bd6d5a26f72711
+refs/heads/master: a393edad2a1d5a53918bfb5ac1608fb8d17068dc
diff --git a/trunk/drivers/media/common/Kconfig b/trunk/drivers/media/common/Kconfig
@@ -12,6 +12,10 @@ config VIDEO_BTCX
 	depends on PCI
 	tristate
 
+config VIDEO_TVEEPROM
+	tristate
+	depends on I2C
+
 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,3 +1,4 @@
 obj-y += b2c2/ saa7146/ siano/
 obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
 obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o
+obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
diff --git a/trunk/drivers/media/i2c/tveeprom.c → trunk/drivers/media/common/tveeprom.c b/trunk/drivers/media/i2c/tveeprom.c → trunk/drivers/media/common/tveeprom.c
diff --git a/trunk/drivers/media/i2c/Kconfig b/trunk/drivers/media/i2c/Kconfig
@@ -1,11 +1,3 @@
-#
-# Generic video config states
-#
-
-config VIDEO_TVEEPROM
-	tristate
-	depends on I2C
-
 #
 # Multimedia Video device configuration
 #

diff --git a/trunk/drivers/media/i2c/Makefile b/trunk/drivers/media/i2c/Makefile
@@ -49,7 +49,6 @@ obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
 obj-$(CONFIG_VIDEO_OV7670) 	+= ov7670.o
 obj-$(CONFIG_VIDEO_OV9650) += ov9650.o
 obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o
-obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
 obj-$(CONFIG_VIDEO_MT9M032) += mt9m032.o
 obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o
 obj-$(CONFIG_VIDEO_MT9T001) += mt9t001.o