diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2019-07-22 13:27:49 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2019-07-22 13:27:49 +0100 |
| commit | 1c98607f418b4e3014a9f386f9398b4a1bd61d38 (patch) | |
| tree | 08868d83ffd266cfb24de16f0005c8b416ec9403 /kernel-armv7hl-lpae-debug.config | |
| parent | c7dd95a6bb07795d500fb288a61f7974447ed514 (diff) | |
| download | kernel-1c98607f418b4e3014a9f386f9398b4a1bd61d38.tar.gz kernel-1c98607f418b4e3014a9f386f9398b4a1bd61d38.tar.xz kernel-1c98607f418b4e3014a9f386f9398b4a1bd61d38.zip | |
arm: part 4 (and the last) of the merge window updates
Diffstat (limited to 'kernel-armv7hl-lpae-debug.config')
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index de1034f79..6881f8886 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1383,7 +1383,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 @@ -1874,10 +1873,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 @@ -2426,7 +2421,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 @@ -4221,7 +4215,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 |