From 5db1c2a6358d855a3dbda77980c0f4f08ddfd9f2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 1 Jul 2019 12:06:54 +0100 Subject: [PATCH 686/806] Revert "configs: arm64/bcm2711: Remove CONFIG_VIDEO_BCM2835" This reverts commit 9d1deec93fa8b1b4953ff5e9210349f3c85b9a8d. The issues are resolved, so reenable. Signed-off-by: Dave Stevenson --- arch/arm/configs/bcm2709_defconfig | 2 +- arch/arm64/configs/bcm2711_defconfig | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -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 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -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