summaryrefslogtreecommitdiffstats
path: root/configs/fedora/generic/s390x
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-06-15 06:40:47 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-06-15 06:40:47 +0200
commite1653ae6c388acd8cc7ad3a05da14946fdf9ded6 (patch)
tree5727a249e83f18a7dc17236e789233bfd6993dc5 /configs/fedora/generic/s390x
parent27857783d0156125a03d14c891556e79dc45f5c3 (diff)
parent23d80a61e9c41d533a0377712ab7b6761ce52bf9 (diff)
downloadkernel-e1653ae6c388acd8cc7ad3a05da14946fdf9ded6.tar.gz
kernel-e1653ae6c388acd8cc7ad3a05da14946fdf9ded6.tar.xz
kernel-e1653ae6c388acd8cc7ad3a05da14946fdf9ded6.zip
merge origin
Diffstat (limited to 'configs/fedora/generic/s390x')
-rw-r--r--configs/fedora/generic/s390x/CONFIG_64BIT1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_ARCH_RANDOM1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_NODES_SHIFT2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_QETH_OSN1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_QETH_OSX1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_ZLIB_DFLTCC1
6 files changed, 5 insertions, 2 deletions
diff --git a/configs/fedora/generic/s390x/CONFIG_64BIT b/configs/fedora/generic/s390x/CONFIG_64BIT
new file mode 100644
index 000000000..06a94e48b
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_64BIT
@@ -0,0 +1 @@
+CONFIG_64BIT=y
diff --git a/configs/fedora/generic/s390x/CONFIG_ARCH_RANDOM b/configs/fedora/generic/s390x/CONFIG_ARCH_RANDOM
deleted file mode 100644
index 51658fe1c..000000000
--- a/configs/fedora/generic/s390x/CONFIG_ARCH_RANDOM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_RANDOM=y
diff --git a/configs/fedora/generic/s390x/CONFIG_NODES_SHIFT b/configs/fedora/generic/s390x/CONFIG_NODES_SHIFT
index 747517623..7768e1477 100644
--- a/configs/fedora/generic/s390x/CONFIG_NODES_SHIFT
+++ b/configs/fedora/generic/s390x/CONFIG_NODES_SHIFT
@@ -1 +1 @@
-CONFIG_NODES_SHIFT=4
+CONFIG_NODES_SHIFT=1
diff --git a/configs/fedora/generic/s390x/CONFIG_QETH_OSN b/configs/fedora/generic/s390x/CONFIG_QETH_OSN
new file mode 100644
index 000000000..80386fea2
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_QETH_OSN
@@ -0,0 +1 @@
+CONFIG_QETH_OSN=y
diff --git a/configs/fedora/generic/s390x/CONFIG_QETH_OSX b/configs/fedora/generic/s390x/CONFIG_QETH_OSX
new file mode 100644
index 000000000..3ab5e1426
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_QETH_OSX
@@ -0,0 +1 @@
+CONFIG_QETH_OSX=y
diff --git a/configs/fedora/generic/s390x/CONFIG_ZLIB_DFLTCC b/configs/fedora/generic/s390x/CONFIG_ZLIB_DFLTCC
new file mode 100644
index 000000000..a1bcfe6b5
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_ZLIB_DFLTCC
@@ -0,0 +1 @@
+CONFIG_ZLIB_DFLTCC=y