summaryrefslogtreecommitdiffstats
path: root/kernel-i686-debug.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-07-22 13:27:49 +0100
committerPeter Robinson <pbrobinson@gmail.com>2019-07-22 13:27:49 +0100
commit1c98607f418b4e3014a9f386f9398b4a1bd61d38 (patch)
tree08868d83ffd266cfb24de16f0005c8b416ec9403 /kernel-i686-debug.config
parentc7dd95a6bb07795d500fb288a61f7974447ed514 (diff)
downloadkernel-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-i686-debug.config')
-rw-r--r--kernel-i686-debug.config7
1 files changed, 0 insertions, 7 deletions
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index d6c227081..39c4238a6 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1200,7 +1200,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_DPTF_POWER=m
@@ -1670,10 +1669,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
@@ -2217,7 +2212,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
@@ -3979,7 +3973,6 @@ CONFIG_NULL_TTY=m
# CONFIG_NUMA is not set
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