summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2018-06-15 12:57:54 +0100
committerPeter Robinson <pbrobinson@gmail.com>2018-06-15 12:57:54 +0100
commitc36cd75159e9c50ca034029d0e33f83adcc366c8 (patch)
treea068919e41ce83331a526505683f2e14e0807ea1 /kernel-s390x.config
parent861ae54010f0dae5c988105b6179a8f2442851e7 (diff)
downloadkernel-c36cd75159e9c50ca034029d0e33f83adcc366c8.tar.gz
kernel-c36cd75159e9c50ca034029d0e33f83adcc366c8.tar.xz
kernel-c36cd75159e9c50ca034029d0e33f83adcc366c8.zip
ARM updates for 4.18, cleanup some dropped config options
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config22
1 files changed, 1 insertions, 21 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index a6bae416d..818a8fe2c 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -199,7 +199,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_W90X900 is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_ERRATUM_858921=y
-# CONFIG_ARM_CCI_PMU is not set
# CONFIG_AS3935 is not set
# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -928,7 +927,6 @@ CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA512_S390=m
CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_SM4_ARM64_CE is not set
CONFIG_CRYPTO_SM4=m
CONFIG_CRYPTO_SPECK=m
CONFIG_CRYPTO_TEA=m
@@ -1139,10 +1137,6 @@ CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
-# CONFIG_DRM_EXYNOS_FIMC is not set
-# CONFIG_DRM_EXYNOS_GSC is not set
-# CONFIG_DRM_EXYNOS_ROTATOR is not set
-# CONFIG_DRM_EXYNOS_SCALER is not set
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_FBDEV_OVERALLOC=100
CONFIG_DRM_HISI_HIBMC=m
@@ -1201,7 +1195,6 @@ CONFIG_DRM_SII9234=m
CONFIG_DRM_TI_TFP410=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_UDL=m
-# CONFIG_DRM_V3D is not set
# CONFIG_DRM_VBOXVIDEO is not set
CONFIG_DRM_VGEM=m
CONFIG_DRM_VIA=m
@@ -1901,7 +1894,6 @@ CONFIG_I40EVF=m
CONFIG_I82092=m
# CONFIG_IAQCORE is not set
CONFIG_IBM_PARTITION=y
-# CONFIG_IBMVMC is not set
CONFIG_ICE=m
CONFIG_ICPLUS_PHY=m
# CONFIG_ICS932S401 is not set
@@ -1939,7 +1931,7 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m
# CONFIG_IIO is not set
CONFIG_IIO_KFIFO_BUF=m
CONFIG_IIO_MUX=m
-# CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE=m
# CONFIG_IIO_SIMPLE_DUMMY is not set
# CONFIG_IIO_SSP_SENSORHUB is not set
CONFIG_IIO_ST_ACCEL_3AXIS=m
@@ -2151,7 +2143,6 @@ CONFIG_IPMI_DEVICE_INTERFACE=m
CONFIG_IPMI_HANDLER=m
# CONFIG_IPMI_PANIC_EVENT is not set
CONFIG_IPMI_POWEROFF=m
-# CONFIG_IPMI_PROC_INTERFACE is not set
CONFIG_IPMI_SI=m
CONFIG_IPMI_SSIF=m
CONFIG_IPMI_WATCHDOG=m
@@ -2257,7 +2248,6 @@ CONFIG_IPVTAP=m
# CONFIG_IPW2200_DEBUG is not set
# CONFIG_IPW2200 is not set
CONFIG_IPWIRELESS=m
-# CONFIG_IPX is not set
# CONFIG_IRDA is not set
CONFIG_IR_ENE=m
CONFIG_IR_FINTEK=m
@@ -2648,7 +2638,6 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2632 is not set
# CONFIG_LTE_GDM724X is not set
# CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
CONFIG_LV0104CS=m
CONFIG_LWTUNNEL_BPF=y
CONFIG_LWTUNNEL=y
@@ -3117,7 +3106,6 @@ CONFIG_NATIONAL_PHY=m
CONFIG_NATSEMI=m
# CONFIG_NAU7802 is not set
# CONFIG_NBPFAXI_DMA is not set
-# CONFIG_NCP_FS is not set
# CONFIG_ND_BLK is not set
CONFIG_NE2K_PCI=m
# CONFIG_NET_9P_DEBUG is not set
@@ -3767,15 +3755,12 @@ CONFIG_PCIEASPM_DEFAULT=y
CONFIG_PCIEASPM=y
CONFIG_PCIE_CADENCE_HOST=y
CONFIG_PCIE_DPC=y
-# CONFIG_PCIE_DW_HOST_ECAM is not set
# CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
# CONFIG_PCI_ENDPOINT is not set
# CONFIG_PCI_ENDPOINT_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
-# CONFIG_PCIE_ROCKCHIP_HOST is not set
# CONFIG_PCI_FTPCI100 is not set
# CONFIG_PCI_GOOLPC is not set
CONFIG_PCI_HERMES=m
@@ -3960,10 +3945,7 @@ CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
# CONFIG_QCA7000_UART is not set
-# CONFIG_QCOM_APR is not set
-# CONFIG_QCOM_COMMAND_DB is not set
# CONFIG_QCOM_EMAC is not set
-# CONFIG_QCOM_GENI_SE is not set
# CONFIG_QCOM_GLINK_SSR is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
@@ -5138,7 +5120,6 @@ CONFIG_STRIP_ASM_SYMS=y
CONFIG_ST_UVIS25_I2C=m
CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
-# CONFIG_SUN50I_H6_R_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -5511,7 +5492,6 @@ CONFIG_USB_DSBR=m
# CONFIG_USB_DWC3_HOST is not set
# CONFIG_USB_DWC3 is not set
# CONFIG_USB_DWC3_OF_SIMPLE is not set
-# CONFIG_USB_DWC3_QCOM is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
CONFIG_USB_EHCI_HCD=y