summaryrefslogtreecommitdiffstats
path: root/config-s390x
diff options
context:
space:
mode:
Diffstat (limited to 'config-s390x')
-rw-r--r--config-s390x11
1 files changed, 5 insertions, 6 deletions
diff --git a/config-s390x b/config-s390x
index d559c6570..8ead330ec 100644
--- a/config-s390x
+++ b/config-s390x
@@ -1,7 +1,5 @@
CONFIG_64BIT=y
-# CONFIG_MARCH_Z900 is not set
-CONFIG_MARCH_Z9_109=y
-# CONFIG_MARCH_Z990 is not set
+CONFIG_MARCH_Z10=y
CONFIG_NR_CPUS=64
CONFIG_COMPAT=y
@@ -135,6 +133,7 @@ CONFIG_CRYPTO_GHASH_S390=m
CONFIG_CRYPTO_SHA1_S390=m
CONFIG_CRYPTO_SHA256_S390=m
CONFIG_CRYPTO_SHA512_S390=m
+CONFIG_CRYPTO_CRC32_S390=m
#
# Kernel hacking
@@ -158,6 +157,7 @@ CONFIG_MONREADER=m
CONFIG_STACK_GUARD=256
CONFIG_CMM_IUCV=y
+# CONFIG_CPU_IDLE is not set
CONFIG_S390_HYPFS_FS=y
@@ -178,6 +178,7 @@ CONFIG_QETH_L3=m
CONFIG_KVM=m
# CONFIG_KVM_S390_UCONTROL is not set
CONFIG_S390_GUEST=y
+CONFIG_S390_GUEST_OLD_TRANSPORT=y
CONFIG_VIRTIO_CONSOLE=y
@@ -220,7 +221,6 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
CONFIG_PCI=y
CONFIG_PCI_NR_FUNCTIONS=64
-CONFIG_PCI_NR_MSI=256
CONFIG_HOTPLUG_PCI_CPCI=y
CONFIG_HOTPLUG_PCI_SHPC=y
CONFIG_HOTPLUG_PCI_S390=y
@@ -250,8 +250,7 @@ CONFIG_HOTPLUG_PCI_S390=y
# CONFIG_INPUT_TABLET is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
# CONFIG_INPUT_MISC is not set
-# CONFIG_GAMEPORT_EMU10K1 is not set
-# CONFIG_GAMEPORT_FM801 is not set
+# CONFIG_GAMEPORT is not set
# CONFIG_SERIO is not set
# CONFIG_ACCESSIBILITY is not set