summaryrefslogtreecommitdiffstats
path: root/baseconfig
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2017-02-03 13:06:51 -0600
committerJustin M. Forbes <jforbes@redhat.com>2017-02-03 13:06:51 -0600
commitbff70322560535e5f97309fc6cc6c76328a055bd (patch)
tree8e324f1829ce7344587c2895b5ee4c9e4c41b4e9 /baseconfig
parent2788aaebb0c4b3e11a1d0fe910126120beedb733 (diff)
downloadkernel-bff70322560535e5f97309fc6cc6c76328a055bd.tar.gz
kernel-bff70322560535e5f97309fc6cc6c76328a055bd.tar.xz
kernel-bff70322560535e5f97309fc6cc6c76328a055bd.zip
Linux v4.10-rc6-110-g34e00ac
Diffstat (limited to 'baseconfig')
-rw-r--r--baseconfig/s390x/CONFIG_MARCH_Z9001
-rw-r--r--baseconfig/s390x/CONFIG_MARCH_Z9901
-rw-r--r--baseconfig/s390x/CONFIG_MARCH_Z9_1091
-rw-r--r--baseconfig/s390x/CONFIG_MARCH_ZEC121
4 files changed, 1 insertions, 3 deletions
diff --git a/baseconfig/s390x/CONFIG_MARCH_Z900 b/baseconfig/s390x/CONFIG_MARCH_Z900
deleted file mode 100644
index 6fa91108c..000000000
--- a/baseconfig/s390x/CONFIG_MARCH_Z900
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MARCH_Z900 is not set
diff --git a/baseconfig/s390x/CONFIG_MARCH_Z990 b/baseconfig/s390x/CONFIG_MARCH_Z990
deleted file mode 100644
index b0c3638ce..000000000
--- a/baseconfig/s390x/CONFIG_MARCH_Z990
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MARCH_Z990 is not set
diff --git a/baseconfig/s390x/CONFIG_MARCH_Z9_109 b/baseconfig/s390x/CONFIG_MARCH_Z9_109
deleted file mode 100644
index e19e96613..000000000
--- a/baseconfig/s390x/CONFIG_MARCH_Z9_109
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MARCH_Z9_109=y
diff --git a/baseconfig/s390x/CONFIG_MARCH_ZEC12 b/baseconfig/s390x/CONFIG_MARCH_ZEC12
new file mode 100644
index 000000000..7dbcbb3f9
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_MARCH_ZEC12
@@ -0,0 +1 @@
+CONFIG_MARCH_ZEC12=y