diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-02-06 08:03:41 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-08 16:12:29 -0200 |
| commit | a393edad2a1d5a53918bfb5ac1608fb8d17068dc (patch) | |
| tree | 316a5731ecc2e3cdd631c3da6a2b324dfb19ec5b /drivers/media | |
| parent | f1c50f2489f40494658a6b7326bd6d5a26f72711 (diff) | |
| download | linux-a393edad2a1d5a53918bfb5ac1608fb8d17068dc.tar.bz2 | |
[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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/common/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/media/common/Makefile | 1 | ||||
| -rw-r--r-- | drivers/media/common/tveeprom.c (renamed from drivers/media/i2c/tveeprom.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/media/i2c/Makefile | 1 |
5 files changed, 5 insertions, 9 deletions
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig index 28c8a602e7ef..56c25e6299e9 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 cfe34499d993..8f8d18755d15 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 index 3b6cf034976a..3b6cf034976a 100644 --- a/drivers/media/i2c/tveeprom.c +++ b/drivers/media/common/tveeprom.c diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index cd2b17148ad6..7b771baa2212 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -1,12 +1,4 @@ # -# 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 3691e70f4e75..cfefd30cc1bc 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 |