diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index 28c8a602e7ef88ceca25bfe32b4dc5d46c2917e8..56c25e6299e9f0c9a1c48347909f460e7689cd57 100644
--- a/drivers/media/common/Kconfig
+++ b/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/drivers/media/common/Makefile b/drivers/media/common/Makefile
index cfe34499d993d44a5e4d5d6a97aeef107538f944..8f8d18755d1585b322162397e2acea652c502328 100644
--- a/drivers/media/common/Makefile
+++ b/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/drivers/media/i2c/tveeprom.c b/drivers/media/common/tveeprom.c
similarity index 100%
rename from drivers/media/i2c/tveeprom.c
rename to drivers/media/common/tveeprom.c
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index cd2b17148ad67736c0fd1d7e1491802d4ca52c12..7b771baa22127cba2efd28f9436ae2a3baa0bfcc 100644
--- a/drivers/media/i2c/Kconfig
+++ b/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/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index 3691e70f4e7589cdbd9cdd64d58063fe9c39f623..cfefd30cc1bca5950ec631b94e36ebe3bf02dd10 100644
--- a/drivers/media/i2c/Makefile
+++ b/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