diff options
| -rw-r--r-- | drivers/media/common/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/media/common/Makefile | 1 | ||||
| -rw-r--r-- | drivers/media/common/cx2341x.c (renamed from drivers/media/i2c/cx2341x.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/Kconfig | 14 | ||||
| -rw-r--r-- | drivers/media/i2c/Makefile | 1 |
5 files changed, 4 insertions, 15 deletions
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig index d2a436ce77f8..dfac52f312cf 100644 --- a/drivers/media/common/Kconfig +++ b/drivers/media/common/Kconfig @@ -5,6 +5,9 @@ config MEDIA_COMMON_OPTIONS comment "common driver options" depends on MEDIA_COMMON_OPTIONS +config VIDEO_CX2341X + tristate + 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 b8e2e3a33a31..9b8ea4fae06f 100644 --- a/drivers/media/common/Makefile +++ b/drivers/media/common/Makefile @@ -1 +1,2 @@ obj-y += b2c2/ saa7146/ siano/ +obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o diff --git a/drivers/media/i2c/cx2341x.c b/drivers/media/common/cx2341x.c index 103ef6bad2e2..103ef6bad2e2 100644 --- a/drivers/media/i2c/cx2341x.c +++ b/drivers/media/common/cx2341x.c diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index ecdf7e3fdcf4..97f14c24a40c 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -317,20 +317,6 @@ config VIDEO_SAA717X source "drivers/media/i2c/cx25840/Kconfig" -comment "MPEG video encoders" - -config VIDEO_CX2341X - tristate "Conexant CX2341x MPEG encoders" - depends on VIDEO_V4L2 - ---help--- - Support for the Conexant CX23416 MPEG encoders - and CX23415 MPEG encoder/decoders. - - This module currently supports the encoding functions only. - - To compile this driver as a module, choose M here: the - module will be called cx2341x. - comment "Video encoders" config VIDEO_SAA7127 diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile index b35e25798cd3..3a8334f205f3 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -64,6 +64,5 @@ obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o obj-$(CONFIG_VIDEO_AS3645A) += as3645a.o obj-$(CONFIG_VIDEO_SMIAPP_PLL) += smiapp-pll.o obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o -obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o obj-$(CONFIG_VIDEO_AK881X) += ak881x.o obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o |
