summaryrefslogtreecommitdiffstats
path: root/baseconfig/s390x
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2017-02-21 11:21:44 -0800
committerLaura Abbott <labbott@fedoraproject.org>2017-02-21 11:23:09 -0800
commit012c1b49993bba21f6d560dafd146d11fb59c957 (patch)
tree1318c4427321ca62cce928fe3a7b6f4f1319a181 /baseconfig/s390x
parent98b89acd620d4f9acd34e90810ad0d9f710581e2 (diff)
downloadkernel-012c1b49993bba21f6d560dafd146d11fb59c957.tar.gz
kernel-012c1b49993bba21f6d560dafd146d11fb59c957.tar.xz
kernel-012c1b49993bba21f6d560dafd146d11fb59c957.zip
Linux v4.10-1242-g9763dd6
Diffstat (limited to 'baseconfig/s390x')
-rw-r--r--baseconfig/s390x/CONFIG_RMI4_F031
-rw-r--r--baseconfig/s390x/CONFIG_SERIO1
-rw-r--r--baseconfig/s390x/CONFIG_SERIO_LIBPS21
-rw-r--r--baseconfig/s390x/CONFIG_SERIO_SERPORT1
4 files changed, 2 insertions, 2 deletions
diff --git a/baseconfig/s390x/CONFIG_RMI4_F03 b/baseconfig/s390x/CONFIG_RMI4_F03
deleted file mode 100644
index effd70c36..000000000
--- a/baseconfig/s390x/CONFIG_RMI4_F03
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_RMI4_F03 is not set
diff --git a/baseconfig/s390x/CONFIG_SERIO b/baseconfig/s390x/CONFIG_SERIO
deleted file mode 100644
index a0fb6e359..000000000
--- a/baseconfig/s390x/CONFIG_SERIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SERIO is not set
diff --git a/baseconfig/s390x/CONFIG_SERIO_LIBPS2 b/baseconfig/s390x/CONFIG_SERIO_LIBPS2
new file mode 100644
index 000000000..b4e848291
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_SERIO_LIBPS2
@@ -0,0 +1 @@
+CONFIG_SERIO_LIBPS2=m
diff --git a/baseconfig/s390x/CONFIG_SERIO_SERPORT b/baseconfig/s390x/CONFIG_SERIO_SERPORT
new file mode 100644
index 000000000..80a07531f
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_SERIO_SERPORT
@@ -0,0 +1 @@
+CONFIG_SERIO_SERPORT=m