diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-10-29 20:05:12 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-10-29 20:05:12 +0100 |
| commit | ec86f0ba78d10d2f5a8c2b7c37f786d00624e544 (patch) | |
| tree | bdcb004ccafecd64a02d737c4eaa821df06ff8c1 /kernel-s390x-debug.config | |
| parent | 8a045d89e0f40a0c7aca8f8f40a7e1bb6faaf3bd (diff) | |
| parent | 4eb72d37dc5052d3056e9aa4b6bb429c6cb1495a (diff) | |
| download | kernel-ec86f0ba78d10d2f5a8c2b7c37f786d00624e544.tar.gz kernel-ec86f0ba78d10d2f5a8c2b7c37f786d00624e544.tar.xz kernel-ec86f0ba78d10d2f5a8c2b7c37f786d00624e544.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.20.0-0.rc0.git5.1.vanilla.knurd.1.fc30kernel-4.20.0-0.rc0.git5.1.vanilla.knurd.1.fc29kernel-4.20.0-0.rc0.git5.1.vanilla.knurd.1.fc28kernel-4.20.0-0.rc0.git5.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel-s390x-debug.config')
| -rw-r--r-- | kernel-s390x-debug.config | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index b7e863ba3..6d715134a 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -208,6 +208,7 @@ CONFIG_ARCH_RANDOM=y # CONFIG_ARCNET is not set CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_PTDUMP=y +# CONFIG_ARMADA_37XX_WATCHDOG is not set CONFIG_ARM_PTDUMP_DEBUGFS=y CONFIG_ARM_PTDUMP=y # CONFIG_AS3935 is not set @@ -1233,7 +1234,9 @@ CONFIG_DRM_SII9234=m # CONFIG_DRM_SUN6I_DSI is not set # CONFIG_DRM_THINE_THC63LVD1024 is not set # CONFIG_DRM_TINYDRM is not set +CONFIG_DRM_TI_SN65DSI86=m CONFIG_DRM_TI_TFP410=m +CONFIG_DRM_TOSHIBA_TC358764=m # CONFIG_DRM_TOSHIBA_TC358767 is not set CONFIG_DRM_UDL=m # CONFIG_DRM_VBOXVIDEO is not set @@ -1358,6 +1361,7 @@ CONFIG_EEPROM_93CX6=m # CONFIG_EEPROM_93XX46 is not set CONFIG_EEPROM_AT24=m # CONFIG_EEPROM_AT25 is not set +CONFIG_EEPROM_EE1004=m CONFIG_EEPROM_IDT_89HPESX=m CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m @@ -3926,6 +3930,7 @@ CONFIG_PFAULT=y # CONFIG_PHANTOM is not set # CONFIG_PHONE is not set # CONFIG_PHONET is not set +CONFIG_PHY_CADENCE_DP=m # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHYLIB=y CONFIG_PHYLINK=m @@ -4043,6 +4048,7 @@ CONFIG_PROVE_LOCKING=y # CONFIG_PROVE_RCU_REPEATEDLY is not set CONFIG_PROVE_RCU=y CONFIG_PSAMPLE=m +CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y # CONFIG_PSTORE_CONSOLE is not set @@ -5420,6 +5426,7 @@ CONFIG_TERANETICS_PHY=m CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set +# CONFIG_TEST_MEMCAT_P is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -5432,6 +5439,7 @@ CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_UDELAY is not set # CONFIG_TEST_USER_COPY is not set # CONFIG_TEST_UUID is not set +# CONFIG_TEST_XARRAY is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y @@ -5632,6 +5640,7 @@ CONFIG_UBIFS_FS_XATTR=y CONFIG_UCSI_ACPI=m CONFIG_UCSI=m CONFIG_UDF_FS=m +CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set # CONFIG_UFS_DEBUG is not set CONFIG_UFS_FS=m |