diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-02 19:42:41 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-02 19:42:41 +0100 |
commit | 89a5fb9b81444cc454701bef82d39ccf79a4f2b6 (patch) | |
tree | 270f1dcb39f4d254b148ee5cb216e3275dda1da6 /kernel-s390x-debug.config | |
parent | c134eeac30df0957c7603fac52e7916434dc0819 (diff) | |
parent | c3110e368218e094a23feffa69ab71ffbddea773 (diff) | |
download | kernel-89a5fb9b81444cc454701bef82d39ccf79a4f2b6.tar.gz kernel-89a5fb9b81444cc454701bef82d39ccf79a4f2b6.tar.xz kernel-89a5fb9b81444cc454701bef82d39ccf79a4f2b6.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.21.0-0.rc0.git5.1.vanilla.knurd.1.fc30kernel-4.21.0-0.rc0.git5.1.vanilla.knurd.1.fc29kernel-4.21.0-0.rc0.git5.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-s390x-debug.config')
-rw-r--r-- | kernel-s390x-debug.config | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 28c35abe2..264670a33 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1997,6 +1997,8 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set +# CONFIG_IMX_SCU_PD is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -2798,6 +2800,7 @@ 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_CLK_MEASURE 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 @@ -3863,6 +3866,7 @@ CONFIG_PINCTRL_CEDARFORK=m # CONFIG_PINCTRL_IPQ8074 is not set # CONFIG_PINCTRL is not set # CONFIG_PINCTRL_MCP23S08 is not set +# CONFIG_PINCTRL_OCELOT is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set @@ -3877,6 +3881,7 @@ CONFIG_PKEY=m # CONFIG_PLATFORM_SI4713 is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4250,6 +4255,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -5305,6 +5311,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA20_EMC is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m |