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

Commit 212afb97 authored by Michael Zoran's avatar Michael Zoran Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835-camera: Move driver under vc04_services



The bcm2835-camera driver is part of v04_services, so it makes
sense for it to be located under vc04_services to make
configuration clearer.

Signed-off-by: default avatarMichael Zoran <mzoran@crowfest.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 051420a9
Loading
Loading
Loading
Loading
+0 −2
Original line number Original line Diff line number Diff line
@@ -27,8 +27,6 @@ source "drivers/staging/media/davinci_vpfe/Kconfig"


source "drivers/staging/media/omap4iss/Kconfig"
source "drivers/staging/media/omap4iss/Kconfig"


source "drivers/staging/media/platform/bcm2835/Kconfig"

source "drivers/staging/media/s5p-cec/Kconfig"
source "drivers/staging/media/s5p-cec/Kconfig"


# Keep LIRC at the end, as it has sub-menus
# Keep LIRC at the end, as it has sub-menus
+0 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,6 @@ obj-$(CONFIG_I2C_BCM2048) += bcm2048/
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec/
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec/
obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
obj-$(CONFIG_LIRC_STAGING)	+= lirc/
obj-$(CONFIG_LIRC_STAGING)	+= lirc/
obj-$(CONFIG_VIDEO_BCM2835)	+= platform/bcm2835/
obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += st-cec/
obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += st-cec/
+2 −0
Original line number Original line Diff line number Diff line
@@ -13,5 +13,7 @@ if BCM2835_VCHIQ


source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"
source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"


source "drivers/staging/vc04_services/bcm2835-camera/Kconfig"

endif
endif
+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ vchiq-objs := \
   interface/vchiq_arm/vchiq_connected.o \
   interface/vchiq_arm/vchiq_connected.o \


obj-$(CONFIG_SND_BCM2835)	+= bcm2835-audio/
obj-$(CONFIG_SND_BCM2835)	+= bcm2835-audio/
obj-$(CONFIG_VIDEO_BCM2835)	+= bcm2835-camera/


ccflags-y += -DVCOS_VERIFY_BKPTS=1 -Idrivers/staging/vc04_services -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000
ccflags-y += -DVCOS_VERIFY_BKPTS=1 -Idrivers/staging/vc04_services -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000
+1 −0
Original line number Original line Diff line number Diff line
config VIDEO_BCM2835
config VIDEO_BCM2835
	tristate "Broadcom BCM2835 camera driver"
	tristate "Broadcom BCM2835 camera driver"
	depends on MEDIA_SUPPORT
	depends on VIDEO_V4L2 && (ARCH_BCM2835 || COMPILE_TEST)
	depends on VIDEO_V4L2 && (ARCH_BCM2835 || COMPILE_TEST)
	depends on BCM2835_VCHIQ
	depends on BCM2835_VCHIQ
	depends on ARM
	depends on ARM
Loading