From 1c98607f418b4e3014a9f386f9398b4a1bd61d38 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 22 Jul 2019 13:27:49 +0100 Subject: arm: part 4 (and the last) of the merge window updates --- kernel-armv7hl-lpae.config | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'kernel-armv7hl-lpae.config') diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index bfe47843a..81c72796d 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1376,7 +1376,6 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DRAGONRISE_FF=y @@ -1859,10 +1858,6 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set -# CONFIG_FSL_ENETC is not set -# CONFIG_FSL_ENETC_PTP_CLOCK is not set -# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_IMX8_DDR_PMU is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set @@ -2411,7 +2406,6 @@ CONFIG_IMX_GPCV2=y # CONFIG_IMX_IRQSTEER is not set CONFIG_IMX_MBOX=m # CONFIG_IMX_SCU is not set -# CONFIG_IMX_SCU_SOC is not set CONFIG_IMX_SC_WDT=m CONFIG_IMX_SDMA=m # CONFIG_IMX_WEIM is not set @@ -4202,7 +4196,7 @@ CONFIG_NVME_FC=m CONFIG_NVMEM_IMX_IIM=m CONFIG_NVMEM_IMX_OCOTP=m # CONFIG_NVMEM_REBOOT_MODE is not set -# CONFIG_NVMEM_SNVS_LPGPR is not set +CONFIG_NVMEM_SNVS_LPGPR=m CONFIG_NVMEM_STM32_ROMEM=m CONFIG_NVMEM_SUNXI_SID=m CONFIG_NVMEM_SYSFS=y -- cgit