summaryrefslogtreecommitdiffstats
path: root/config-s390x
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-11-17 11:20:21 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2013-11-17 11:20:21 -0500
commitab2a11bf7e8baa25b38a408f94b4b2875bb0f0a6 (patch)
treeda5029e045eaf3a203b0c2bba109df680ddfd74b /config-s390x
parent6494f2c3b13d79f6705faceb0efde9029bd56bbf (diff)
downloadkernel-ab2a11bf7e8baa25b38a408f94b4b2875bb0f0a6.tar.gz
kernel-ab2a11bf7e8baa25b38a408f94b4b2875bb0f0a6.tar.xz
kernel-ab2a11bf7e8baa25b38a408f94b4b2875bb0f0a6.zip
Linux v3.12-10087-g1213959
- Update s390x config from Dan Horák
Diffstat (limited to 'config-s390x')
-rw-r--r--config-s390x3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-s390x b/config-s390x
index f9f1f82d8..0da596510 100644
--- a/config-s390x
+++ b/config-s390x
@@ -247,6 +247,7 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
# CONFIG_INPUT_TABLET is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
# CONFIG_INPUT_MISC is not set
+# CONFIG_SERIO is not set
# CONFIG_ACCESSIBILITY is not set
# CONFIG_AUXDISPLAY is not set
@@ -278,4 +279,4 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
# CONFIG_FMC is not set
-CONFIG_CRASH=m
+# CONFIG_CRASH is not set