summaryrefslogtreecommitdiffstats
path: root/config-s390x
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-11-26 08:08:55 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2013-11-26 08:08:55 -0500
commit84deb1c0ecb9c4b6975d7ef54dde1fd95bcd33cf (patch)
tree182c1ed063e92700ca2d0b8f03dbaa48fc6a9559 /config-s390x
parent96d245ede5fa0b9cd51df3ebc1eae6b792b347cd (diff)
downloadkernel-84deb1c0ecb9c4b6975d7ef54dde1fd95bcd33cf.tar.gz
kernel-84deb1c0ecb9c4b6975d7ef54dde1fd95bcd33cf.tar.xz
kernel-84deb1c0ecb9c4b6975d7ef54dde1fd95bcd33cf.zip
Update s390x 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