summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-03-12 11:50:12 +0000
committerPeter Robinson <pbrobinson@gmail.com>2019-03-12 11:50:12 +0000
commitdab12d564c0cf1a32a5576198ad476d125afc3fb (patch)
treec533b430876f12f42954bceff8cfc39e405f1994 /kernel-s390x.config
parent598acf31326173f3b3420a7365ccb375f6c5288b (diff)
downloadkernel-dab12d564c0cf1a32a5576198ad476d125afc3fb.tar.gz
kernel-dab12d564c0cf1a32a5576198ad476d125afc3fb.tar.xz
kernel-dab12d564c0cf1a32a5576198ad476d125afc3fb.zip
Arm config updates and fixes, fixes for Jetson TX series
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config7
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 195c220fa..878e3c16f 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -752,7 +752,6 @@ CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_COMMON_RESET_HI3660 is not set
CONFIG_COMPACTION=y
# CONFIG_COMPAT_BRK is not set
CONFIG_COMPAT=y
@@ -2710,9 +2709,6 @@ CONFIG_MEMSTICK_TIFM_MS=m
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
# CONFIG_MEMTEST is not set
# CONFIG_MEN_A21_WDT is not set
-# CONFIG_MESON_GX_PM_DOMAINS is not set
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_88PM800 is not set
# CONFIG_MFD_88PM805 is not set
@@ -3939,7 +3935,6 @@ CONFIG_RAPIDIO_RXS_GEN3=m
CONFIG_RAPIDIO_TSI568=m
CONFIG_RAPIDIO_TSI57X=m
CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAS_CEC=y
# CONFIG_RAVE_SP_CORE is not set
CONFIG_RAW_DRIVER=y
# CONFIG_RBTREE_TEST is not set
@@ -4023,7 +4018,7 @@ CONFIG_REISERFS_PROC_INFO=y
CONFIG_RELAY=y
# CONFIG_RELOCATABLE_TEST is not set
CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
# CONFIG_RESET_ATTACK_MITIGATION is not set
# CONFIG_RESET_CONTROLLER is not set
# CONFIG_RESET_TI_SYSCON is not set