summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Horák <dan@danny.cz>2013-02-13 11:19:58 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-02-13 11:19:58 -0500
commit44020b3fb3771f3b33a0214a71f8939be6dab18b (patch)
tree279027eed2f630a725153dfb84b8d350e649f575
parentdadd60bd6d9ecc18a14a8cd8b76c6a1faf5e27ed (diff)
downloadkernel-44020b3fb3771f3b33a0214a71f8939be6dab18b.tar.gz
kernel-44020b3fb3771f3b33a0214a71f8939be6dab18b.tar.xz
kernel-44020b3fb3771f3b33a0214a71f8939be6dab18b.zip
update the s390x config for 3.8
-rw-r--r--config-s390x12
1 files changed, 8 insertions, 4 deletions
diff --git a/config-s390x b/config-s390x
index c1a616f77..c0ae0aa0a 100644
--- a/config-s390x
+++ b/config-s390x
@@ -244,10 +244,10 @@ CONFIG_ETHERNET=y
CONFIG_BPF_JIT=y
# CONFIG_TRANSPARENT_HUGEPAGE is not set
-# CONFIG_SCM_BUS is not set
-# CONFIG_EADM_SCH is not set
-# CONFIG_SCM_BLOCK is not set
-# CONFIG_SCM_BLOCK_CLUSTER_WRITE is not set
+CONFIG_SCM_BUS=y
+CONFIG_EADM_SCH=m
+CONFIG_SCM_BLOCK=m
+CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
# CONFIG_S390_PTDUMP is not set
# CONFIG_ASYMMETRIC_KEY_TYPE is not set
CONFIG_PCI_NR_FUNCTIONS=64
@@ -259,3 +259,7 @@ CONFIG_HOTPLUG_PCI_S390=m
# CONFIG_SGI_IOC4 is not set
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_MCP23S08 is not set
+
+# CONFIG_PCI is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_PTP_1588_CLOCK_PCH is not set