Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8fc7298 authored by Jonathan Corbet's avatar Jonathan Corbet Committed by Mauro Carvalho Chehab
Browse files

[media] marvell-cam: Move cafe-ccic into its own directory 



This driver will soon become a family of drivers, so let's give it its own
place to live.  This move requires putting ov7670.h into include/media, but
there are no code changes.

Cc: Daniel Drake <dsd@laptop.org>
Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent bd7319dc

drivers/media/video/Kconfig

+2 −9
Original line number Diff line number Diff line
@@ -707,6 +707,8 @@ source "drivers/media/video/cx18/Kconfig" 


source "drivers/media/video/saa7164/Kconfig"



source "drivers/media/video/marvell-ccic/Kconfig"



config VIDEO_M32R_AR

	tristate "AR devices"

	depends on M32R && VIDEO_V4L2
@@ -726,15 +728,6 @@ config VIDEO_M32R_AR_M64278 
	  To compile this driver as a module, choose M here: the

	  module will be called arv.



config VIDEO_CAFE_CCIC

	tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"

	depends on PCI && I2C && VIDEO_V4L2

	select VIDEO_OV7670

	---help---

	  This is a video4linux2 driver for the Marvell 88ALP01 integrated

	  CMOS camera controller.  This is the controller found on first-

	  generation OLPC systems.



config VIDEO_SR030PC30

	tristate "SR030PC30 VGA camera sensor support"

	depends on I2C && VIDEO_V4L2

drivers/media/video/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o 


obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o



obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o

obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/



obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o

drivers/media/video/marvell-ccic/Kconfig

0 → 100644
+9 −0
Original line number Diff line number Diff line 
config VIDEO_CAFE_CCIC

	tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"

	depends on PCI && I2C && VIDEO_V4L2

	select VIDEO_OV7670

	---help---

	  This is a video4linux2 driver for the Marvell 88ALP01 integrated

	  CMOS camera controller.  This is the controller found on first-

	  generation OLPC systems.

drivers/media/video/marvell-ccic/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o