summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2019-03-06 14:54:04 +0000
committerJeremy Cline <jcline@redhat.com>2019-03-06 17:15:13 +0000
commit4997df9dcb663da11fbee9e64d8a742aa9eea1e6 (patch)
treefef4fb7545e944e3f6e84eabc4fd0d15a6dc163f /kernel-s390x.config
parent3d243755183fabf052de7e407783dc272cdbf258 (diff)
downloadkernel-4997df9dcb663da11fbee9e64d8a742aa9eea1e6.tar.gz
kernel-4997df9dcb663da11fbee9e64d8a742aa9eea1e6.tar.xz
kernel-4997df9dcb663da11fbee9e64d8a742aa9eea1e6.zip
Linux v5.0-3452-g3717f613f48d
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config10
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index be3e28d6b..65036ee0e 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -865,6 +865,7 @@ CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZO=y
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
@@ -1449,6 +1450,9 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
@@ -2621,6 +2625,7 @@ CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
# CONFIG_MDIO_BUS_MUX is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
CONFIG_MDIO_DEVICE=y
# CONFIG_MDIO_GPIO is not set
# CONFIG_MDIO_HISI_FEMAC is not set
@@ -2926,6 +2931,7 @@ CONFIG_MSDOS_PARTITION=y
# CONFIG_MSM_GCC_8998 is not set
CONFIG_MSPRO_BLOCK=m
CONFIG_MT7601U=m
+CONFIG_MT7603E=m
CONFIG_MT76x0E=m
CONFIG_MT76x0U=m
CONFIG_MT76x2E=m
@@ -3048,7 +3054,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
# CONFIG_NETDEVSIM is not set
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
@@ -3699,6 +3705,7 @@ CONFIG_PHY_CADENCE_SIERRA=m
CONFIG_PHYLIB=y
CONFIG_PHYLINK=m
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MVEBU_A38X_COMPHY 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
@@ -5924,6 +5931,7 @@ CONFIG_WLCORE_SPI=m
# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
CONFIG_X86_MCELOG_LEGACY=y
# CONFIG_X86_PTDUMP is not set
+CONFIG_XDP_SOCKETS_DIAG=m
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set