Skip to content

Commit

Permalink
[media] tveeprom: move from media/i2c to media/common
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Feb 8, 2013
1 parent f1c50f2 commit a393eda
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 9 deletions.
4 changes: 4 additions & 0 deletions drivers/media/common/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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 change: 1 addition & 0 deletions drivers/media/common/Makefile
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
8 changes: 0 additions & 8 deletions drivers/media/i2c/Kconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
#
# Generic video config states
#

config VIDEO_TVEEPROM
tristate
depends on I2C

#
# Multimedia Video device configuration
#
Expand Down
1 change: 0 additions & 1 deletion drivers/media/i2c/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a393eda

Please sign in to comment.