diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-12 16:22:44 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-12 16:22:44 +0100 |
| commit | 2d18e84dea30db49451c7a0d2ba7df2a6857c04d (patch) | |
| tree | 444e806e3f18ac8336cd27bf31009bec65f83f88 /kernel-s390x-debug.config | |
| parent | 9d6d4acbd6146b04f32ee96db5730ccd2b64df35 (diff) | |
| parent | fe3f29352b50ab76164e008a657daaf01d61f48c (diff) | |
| download | kernel-5.1.0-0.rc0.git6.1.vanilla.knurd.1.fc30.tar.gz kernel-5.1.0-0.rc0.git6.1.vanilla.knurd.1.fc30.tar.xz kernel-5.1.0-0.rc0.git6.1.vanilla.knurd.1.fc30.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.1.0-0.rc0.git6.1.vanilla.knurd.1.fc31kernel-5.1.0-0.rc0.git6.1.vanilla.knurd.1.fc30kernel-5.1.0-0.rc0.git6.1.vanilla.knurd.1.fc29kernel-5.1.0-0.rc0.git6.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-s390x-debug.config')
| -rw-r--r-- | kernel-s390x-debug.config | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index afe52835f..e1f1642de 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -753,7 +753,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 @@ -809,6 +808,7 @@ CONFIG_CRC8=m CONFIG_CRC_CCITT=y CONFIG_CRC_ITU_T=m CONFIG_CRC_T10DIF=y +# CONFIG_CROS_EC_DEBUGFS is not set # CONFIG_CROS_EC_LIGHTBAR is not set CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y @@ -2041,6 +2041,7 @@ CONFIG_INPUT_LEDS=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_MSM_VIBRATOR is not set # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_PM8XXX_VIBRATOR=m @@ -2729,9 +2730,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 @@ -2884,6 +2882,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m @@ -3960,7 +3959,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 @@ -4044,7 +4042,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 |