From: Tony Lindgren Date: Tue, 16 Apr 2019 14:05:07 +0000 (-0700) Subject: ARM: multi_v7_defconfig: Update for dropped options X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0d2cd68662f4a607c4fb3464d1a4d91a8c2854df;p=linux.git ARM: multi_v7_defconfig: Update for dropped options These are mostly automatically selected with make multi_v7_defconfig, except for SH_DMAE which is selected only by sound/soc/sh/Kconfig. Then CONFIG_SND_SIMPLE_SCU_CARD no longer exists at all. And CONFIG_SOC_CAMERA and CONFIG_SOC_CAMERA_PLATFORM are tagged to depend on BROKEN, so we can drop them. Cc: Arnd Bergmann Cc: Geert Uytterhoeven Cc: Olof Johansson Cc: Russell King Cc: Simon Horman Acked-by: Geert Uytterhoeven Acked-by: Simon Horman Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index c75051b9392c5..a703d11b43ef2 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -230,7 +230,6 @@ CONFIG_VIRTIO_NET=y CONFIG_B53_SPI_DRIVER=m CONFIG_B53_MDIO_DRIVER=m CONFIG_B53_MMAP_DRIVER=m -CONFIG_B53_SRAB_DRIVER=m CONFIG_NET_DSA_BCM_SF2=m CONFIG_SUN4I_EMAC=y CONFIG_BCMGENET=m @@ -259,7 +258,6 @@ CONFIG_BROADCOM_PHY=y CONFIG_ICPLUS_PHY=y CONFIG_MARVELL_PHY=y CONFIG_MICREL_PHY=y -CONFIG_REALTEK_PHY=y CONFIG_ROCKCHIP_PHY=y CONFIG_SMSC_PHY=y CONFIG_USB_PEGASUS=y @@ -579,8 +577,6 @@ CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_STM32_DCMI=m -CONFIG_SOC_CAMERA=m -CONFIG_SOC_CAMERA_PLATFORM=m CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m CONFIG_VIDEO_S5P_FIMC=m CONFIG_VIDEO_S5P_MIPI_CSIS=m @@ -701,7 +697,6 @@ CONFIG_SND_SOC_SGTL5000=m CONFIG_SND_SOC_SPDIF=m CONFIG_SND_SOC_STI_SAS=m CONFIG_SND_SOC_WM8978=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_USB=y CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y @@ -877,7 +872,6 @@ CONFIG_UNIPHIER_MDMAC=y CONFIG_XILINX_DMA=y CONFIG_QCOM_BAM_DMA=y CONFIG_DW_DMAC=y -CONFIG_SH_DMAE=y CONFIG_RCAR_DMAC=y CONFIG_RENESAS_USB_DMAC=m CONFIG_VIRTIO_PCI=y