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-s390x-debug.config | 7 ------- 1 file changed, 7 deletions(-) (limited to 'kernel-s390x-debug.config') diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 945dba589..0bc7667a9 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1117,7 +1117,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 @@ -1517,10 +1516,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_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set CONFIG_FS_MBCACHE=y @@ -2001,7 +1996,6 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set -# CONFIG_IMX_SCU_SOC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3669,7 +3663,6 @@ CONFIG_NUMA_EMU=y CONFIG_NUMA=y CONFIG_NVME_FC=m # CONFIG_NVMEM_REBOOT_MODE is not set -# CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y -- cgit