summaryrefslogtreecommitdiffstats
path: root/kernel-aarch64.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-aarch64.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-aarch64.config')
-rw-r--r--kernel-aarch64.config8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index d3ac53b6b..179c5adaa 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -181,7 +181,7 @@ CONFIG_AIX_PARTITION=y
# CONFIG_AK8974 is not set
CONFIG_AK8975=m
# CONFIG_AL3320A is not set
-# CONFIG_AL_FIC is not set
+CONFIG_AL_FIC=y
CONFIG_ALIM1535_WDT=m
CONFIG_ALIM7101_WDT=m
CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
@@ -1414,7 +1414,7 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
CONFIG_DP83867_PHY=m
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
+CONFIG_DPAA2_CONSOLE=m
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
@@ -1889,7 +1889,7 @@ CONFIG_FSL_DPAA2=y
CONFIG_FSL_DPAA_ETH=m
CONFIG_FSL_DPAA=y
CONFIG_FSL_EDMA=m
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
+CONFIG_FSL_ENETC_HW_TIMESTAMPING=y
CONFIG_FSL_ENETC=m
CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_VF=m
@@ -2459,7 +2459,7 @@ CONFIG_IMX_GPCV2=y
CONFIG_IMX_MBOX=m
CONFIG_IMX_REMOTEPROC=m
CONFIG_IMX_SCU_PD=y
-# CONFIG_IMX_SCU_SOC is not set
+CONFIG_IMX_SCU_SOC=y
CONFIG_IMX_SCU=y
CONFIG_IMX_SC_WDT=m
CONFIG_IMX_SDMA=m