diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-14 21:26:03 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-14 21:26:03 +0100 |
commit | 41c0bfe47586992f62ce2165329a36ebe503d2a4 (patch) | |
tree | d49e3501f22ca853b276cde5a17c39a3e158a989 /kernel-s390x-debug.config | |
parent | 94a320769616c439b667525f738e98c961a36c8d (diff) | |
parent | 3cc187999e62194e67cb5c215491fd6275c51b82 (diff) | |
download | kernel-41c0bfe47586992f62ce2165329a36ebe503d2a4.tar.gz kernel-41c0bfe47586992f62ce2165329a36ebe503d2a4.tar.xz kernel-41c0bfe47586992f62ce2165329a36ebe503d2a4.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.1.0-0.rc0.git8.1.vanilla.knurd.1.fc31kernel-5.1.0-0.rc0.git8.1.vanilla.knurd.1.fc30kernel-5.1.0-0.rc0.git8.1.vanilla.knurd.1.fc29kernel-5.1.0-0.rc0.git8.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-s390x-debug.config')
-rw-r--r-- | kernel-s390x-debug.config | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index ce01f42cb..888817174 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1520,7 +1520,7 @@ CONFIG_GAMEPORT_L4=m CONFIG_GAMEPORT_NS558=m # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set -CONFIG_GCC_PLUGIN_STACKLEAK=y +# CONFIG_GCC_PLUGIN_STACKLEAK is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK is not set CONFIG_GCC_PLUGINS=y # CONFIG_GCOV_KERNEL is not set @@ -3888,6 +3888,8 @@ CONFIG_PTP_1588_CLOCK=y CONFIG_PVPANIC=m # CONFIG_PWM_FSL_FTM is not set CONFIG_PWM_HIBVT=m +# CONFIG_PWM_IMX1 is not set +# CONFIG_PWM_IMX27 is not set # CONFIG_PWM is not set # CONFIG_PWM_PCA9685 is not set CONFIG_PWRSEQ_EMMC=m @@ -6076,5 +6078,6 @@ CONFIG_ZSMALLOC=y CONFIG_ZSWAP=y # CONFIG_ZX_TDM is not set # CONFIG_ZYNQMP_FIRMWARE_DEBUG is not set +# CONFIG_ZYNQMP_IPI_MBOX is not set # CONFIG_ZYNQMP_PM_DOMAINS is not set # CONFIG_ZYNQMP_POWER is not set |