From a2e4f52009334eb3905f71425402840f54aa9eaa Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 3 Jan 2019 01:18:51 +0000 Subject: some fixups for general fedpkg prep on 4.21 --- kernel-s390x.config | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'kernel-s390x.config') diff --git a/kernel-s390x.config b/kernel-s390x.config index 4a38f32a5..ffe76f308 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1979,8 +1979,6 @@ 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 @@ -2779,7 +2777,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_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 @@ -2891,7 +2888,7 @@ CONFIG_MIGRATION=y CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y -# CONFIG_MISC_ALCOR_PCI is not set +CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISC_RTSX_PCI is not set # CONFIG_MISC_RTSX_USB is not set @@ -3829,6 +3826,7 @@ CONFIG_PHYLIB=y CONFIG_PHYLINK=m # CONFIG_PHY_MAPPHONE_MDM6600 is not set # CONFIG_PHY_MVEBU_CP110_COMPHY is not set +# CONFIG_PHY_OCELOT_SERDES is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set @@ -3859,7 +3857,6 @@ 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 is not set # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4232,7 +4229,6 @@ 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 @@ -5287,7 +5283,6 @@ 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 -- cgit