Commit 62595820 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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



The cx2341x module is a helper module for conexant-based MPEG encoders.
It isn't an i2c module at all, instead it should be in common since it is
used by 7 pci and usb drivers to handle the MPEG setup.
It also shouldn't be visible in the config menu as it is always
selected automatically by those drivers that need it.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent da92c293

drivers/media/common/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -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"

drivers/media/common/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-y += b2c2/ saa7146/ siano/

obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o

drivers/media/i2c/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -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

drivers/media/i2c/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE