Commit 83c19d81 authored by Dave Stevenson's avatar Dave Stevenson Committed by Phil Elwell
Browse files

Revert "configs: arm64/bcm2711: Remove CONFIG_VIDEO_BCM2835" 



This reverts commit 9d1deec9.

The issues are resolved, so reenable.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
parent 0989d75d

arch/arm/configs/bcm2709_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ CONFIG_IKCONFIG=m 
CONFIG_IKCONFIG_PROC=y

CONFIG_MEMCG=y

CONFIG_BLK_CGROUP=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_PIDS=y

CONFIG_NAMESPACES=y

CONFIG_USER_NS=y

CONFIG_SCHED_AUTOGROUP=y

arch/arm64/configs/bcm2711_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -1031,6 +1031,7 @@ CONFIG_USB_G_HID=m 
CONFIG_USB_G_WEBCAM=m

CONFIG_MMC=y

CONFIG_MMC_BLOCK_MINORS=32

CONFIG_MMC_SDHCI_BCM2711=y

CONFIG_MMC_BCM2835_MMC=y

CONFIG_MMC_BCM2835_DMA=y

CONFIG_MMC_BCM2835_SDHOST=y
@@ -1130,6 +1131,7 @@ CONFIG_FB_TFT_WATTEROTT=m 
CONFIG_FB_FLEX=m

CONFIG_FB_TFT_FBTFT_DEVICE=m

CONFIG_SND_BCM2835=m

CONFIG_VIDEO_BCM2835=m

CONFIG_MAILBOX=y

CONFIG_BCM2835_MBOX=y

# CONFIG_IOMMU_SUPPORT is not set