From dedd91c9bf3e9bc7f455062f52559d4df4d2d62f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 3 Oct 2019 11:10:55 +0100 Subject: second round of arm 5.4 updates --- kernel-s390x.config | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'kernel-s390x.config') diff --git a/kernel-s390x.config b/kernel-s390x.config index e9c67dc4f..a67a21f7a 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -186,12 +186,8 @@ CONFIG_AR5523=m # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set -# CONFIG_ARCH_IOP33X is not set # CONFIG_ARCH_IXP4XX is not set -# CONFIG_ARCH_KS8695 is not set -# CONFIG_ARCH_LPC32XX is not set CONFIG_ARCH_MULTIPLATFORM=y # CONFIG_ARCH_OMAP1 is not set # CONFIG_ARCH_PXA is not set @@ -199,7 +195,6 @@ CONFIG_ARCH_RANDOM=y # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_S3C24XX is not set # CONFIG_ARCH_SA1100 is not set -# CONFIG_ARCH_W90X900 is not set # CONFIG_ARCNET is not set CONFIG_ARM64_ERRATUM_858921=y # CONFIG_AS3935 is not set @@ -1147,7 +1142,7 @@ CONFIG_DRM_DP_CEC=y # CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 -# CONFIG_DRM_GM12U320 is not set +CONFIG_DRM_GM12U320=m # CONFIG_DRM_HISI_HIBMC is not set # CONFIG_DRM_I2C_ADV7511 is not set CONFIG_DRM_I2C_ADV7533=y @@ -1961,7 +1956,7 @@ CONFIG_IIO_TRIGGER=y CONFIG_IKHEADERS=m CONFIG_IMA_APPRAISE_BOOTPARAM=y # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set -# CONFIG_IMA_APPRAISE_MODSIG is not set +CONFIG_IMA_APPRAISE_MODSIG=y CONFIG_IMA_APPRAISE=y # CONFIG_IMA_ARCH_POLICY is not set # CONFIG_IMA_BLACKLIST_KEYRING is not set @@ -1981,7 +1976,6 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set -# CONFIG_IMX_DSP is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -4129,7 +4123,6 @@ CONFIG_REMOTEPROC=y # CONFIG_RENESAS_PHY is not set # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_CONTROLLER is not set -CONFIG_RESET_SCMI=y # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set @@ -4684,7 +4677,6 @@ CONFIG_SERIAL_8250_EXTENDED=y # CONFIG_SERIAL_8250 is not set CONFIG_SERIAL_8250_MANY_PORTS=y # CONFIG_SERIAL_8250_MID is not set -CONFIG_SERIAL_8250_MOXA=m CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_RSA=y @@ -5505,7 +5497,6 @@ CONFIG_TUNE_DEFAULT=y # CONFIG_TUNE_ZEC12 is not set CONFIG_TUN=m # CONFIG_TUN_VNET_CROSS_LE is not set -# CONFIG_TURRIS_MOX_RWTM is not set # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_DP_ALTMODE=m -- cgit