summaryrefslogtreecommitdiffstats
path: root/baseconfig/s390x
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2017-11-15 11:50:50 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2017-11-15 11:50:50 -0600
commit8d54d185ffb14361bf0ce3daff4f15c6029d7859 (patch)
treecccd13cd1ec04fac64d92c92151f584714989723 /baseconfig/s390x
parentd83c4aa672f3474f45586851206035e4e67e141d (diff)
downloadkernel-8d54d185ffb14361bf0ce3daff4f15c6029d7859.tar.gz
kernel-8d54d185ffb14361bf0ce3daff4f15c6029d7859.tar.xz
kernel-8d54d185ffb14361bf0ce3daff4f15c6029d7859.zip
Linux v4.14
Diffstat (limited to 'baseconfig/s390x')
-rw-r--r--baseconfig/s390x/CONFIG_BLK_CPQ_CISS_DA1
-rw-r--r--baseconfig/s390x/CONFIG_CMA1
-rw-r--r--baseconfig/s390x/CONFIG_CMA_AREAS1
-rw-r--r--baseconfig/s390x/CONFIG_CMA_DEBUG1
-rw-r--r--baseconfig/s390x/CONFIG_CMA_DEBUGFS1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_PARPORT1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_PARPORT_LIGHT1
-rw-r--r--baseconfig/s390x/CONFIG_MFD_BD9571MWV1
-rw-r--r--baseconfig/s390x/CONFIG_MFD_RTSX_USB1
-rw-r--r--baseconfig/s390x/CONFIG_MFD_TPS684701
-rw-r--r--baseconfig/s390x/CONFIG_MFD_VIPERBOARD1
-rw-r--r--baseconfig/s390x/CONFIG_PARPORT1
-rw-r--r--baseconfig/s390x/CONFIG_VMCP_CMA_SIZE1
13 files changed, 9 insertions, 4 deletions
diff --git a/baseconfig/s390x/CONFIG_BLK_CPQ_CISS_DA b/baseconfig/s390x/CONFIG_BLK_CPQ_CISS_DA
deleted file mode 100644
index 2e6c723ac..000000000
--- a/baseconfig/s390x/CONFIG_BLK_CPQ_CISS_DA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_CPQ_CISS_DA is not set
diff --git a/baseconfig/s390x/CONFIG_CMA b/baseconfig/s390x/CONFIG_CMA
new file mode 100644
index 000000000..309c9e771
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_CMA
@@ -0,0 +1 @@
+CONFIG_CMA=y
diff --git a/baseconfig/s390x/CONFIG_CMA_AREAS b/baseconfig/s390x/CONFIG_CMA_AREAS
new file mode 100644
index 000000000..5474a48e9
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_CMA_AREAS
@@ -0,0 +1 @@
+CONFIG_CMA_AREAS=7
diff --git a/baseconfig/s390x/CONFIG_CMA_DEBUG b/baseconfig/s390x/CONFIG_CMA_DEBUG
new file mode 100644
index 000000000..64ff80c56
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_CMA_DEBUG
@@ -0,0 +1 @@
+# CONFIG_CMA_DEBUG is not set
diff --git a/baseconfig/s390x/CONFIG_CMA_DEBUGFS b/baseconfig/s390x/CONFIG_CMA_DEBUGFS
new file mode 100644
index 000000000..fba89903a
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_CMA_DEBUGFS
@@ -0,0 +1 @@
+# CONFIG_CMA_DEBUGFS is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_PARPORT b/baseconfig/s390x/CONFIG_I2C_PARPORT
deleted file mode 100644
index 87b55caf2..000000000
--- a/baseconfig/s390x/CONFIG_I2C_PARPORT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_PARPORT is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_PARPORT_LIGHT b/baseconfig/s390x/CONFIG_I2C_PARPORT_LIGHT
deleted file mode 100644
index e18239222..000000000
--- a/baseconfig/s390x/CONFIG_I2C_PARPORT_LIGHT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_PARPORT_LIGHT is not set
diff --git a/baseconfig/s390x/CONFIG_MFD_BD9571MWV b/baseconfig/s390x/CONFIG_MFD_BD9571MWV
new file mode 100644
index 000000000..d321ad3c6
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_MFD_BD9571MWV
@@ -0,0 +1 @@
+# CONFIG_MFD_BD9571MWV is not set
diff --git a/baseconfig/s390x/CONFIG_MFD_RTSX_USB b/baseconfig/s390x/CONFIG_MFD_RTSX_USB
new file mode 100644
index 000000000..b6efa65e7
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_MFD_RTSX_USB
@@ -0,0 +1 @@
+# CONFIG_MFD_RTSX_USB is not set
diff --git a/baseconfig/s390x/CONFIG_MFD_TPS68470 b/baseconfig/s390x/CONFIG_MFD_TPS68470
new file mode 100644
index 000000000..e82f415aa
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_MFD_TPS68470
@@ -0,0 +1 @@
+# CONFIG_MFD_TPS68470 is not set
diff --git a/baseconfig/s390x/CONFIG_MFD_VIPERBOARD b/baseconfig/s390x/CONFIG_MFD_VIPERBOARD
new file mode 100644
index 000000000..1d4d00579
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_MFD_VIPERBOARD
@@ -0,0 +1 @@
+# CONFIG_MFD_VIPERBOARD is not set
diff --git a/baseconfig/s390x/CONFIG_PARPORT b/baseconfig/s390x/CONFIG_PARPORT
deleted file mode 100644
index 9dd8f33af..000000000
--- a/baseconfig/s390x/CONFIG_PARPORT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PARPORT is not set
diff --git a/baseconfig/s390x/CONFIG_VMCP_CMA_SIZE b/baseconfig/s390x/CONFIG_VMCP_CMA_SIZE
new file mode 100644
index 000000000..aee0667ac
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_VMCP_CMA_SIZE
@@ -0,0 +1 @@
+CONFIG_VMCP_CMA_SIZE=4