Browse Source

[media] tveeprom: move from media/i2c to media/common

The tveeprom module is a helper module for Hauppauge-based eeproms.
It's used by many drivers and the i2c part is actually optional, so this
driver is better placed in the media/common directory.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Hans Verkuil 12 years ago
parent
commit
a393edad2a

+ 4 - 0
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"

+ 1 - 0
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

+ 0 - 0
drivers/media/i2c/tveeprom.c → drivers/media/common/tveeprom.c


+ 0 - 8
drivers/media/i2c/Kconfig

@@ -1,11 +1,3 @@
-#
-# Generic video config states
-#
-
-config VIDEO_TVEEPROM
-	tristate
-	depends on I2C
-
 #
 # Multimedia Video device configuration
 #

+ 0 - 1
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