From 8d54d185ffb14361bf0ce3daff4f15c6029d7859 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Wed, 15 Nov 2017 11:50:50 -0600
Subject: Linux v4.14

---
 baseconfig/s390x/CONFIG_BLK_CPQ_CISS_DA   | 1 -
 baseconfig/s390x/CONFIG_CMA               | 1 +
 baseconfig/s390x/CONFIG_CMA_AREAS         | 1 +
 baseconfig/s390x/CONFIG_CMA_DEBUG         | 1 +
 baseconfig/s390x/CONFIG_CMA_DEBUGFS       | 1 +
 baseconfig/s390x/CONFIG_I2C_PARPORT       | 1 -
 baseconfig/s390x/CONFIG_I2C_PARPORT_LIGHT | 1 -
 baseconfig/s390x/CONFIG_MFD_BD9571MWV     | 1 +
 baseconfig/s390x/CONFIG_MFD_RTSX_USB      | 1 +
 baseconfig/s390x/CONFIG_MFD_TPS68470      | 1 +
 baseconfig/s390x/CONFIG_MFD_VIPERBOARD    | 1 +
 baseconfig/s390x/CONFIG_PARPORT           | 1 -
 baseconfig/s390x/CONFIG_VMCP_CMA_SIZE     | 1 +
 13 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 baseconfig/s390x/CONFIG_BLK_CPQ_CISS_DA
 create mode 100644 baseconfig/s390x/CONFIG_CMA
 create mode 100644 baseconfig/s390x/CONFIG_CMA_AREAS
 create mode 100644 baseconfig/s390x/CONFIG_CMA_DEBUG
 create mode 100644 baseconfig/s390x/CONFIG_CMA_DEBUGFS
 delete mode 100644 baseconfig/s390x/CONFIG_I2C_PARPORT
 delete mode 100644 baseconfig/s390x/CONFIG_I2C_PARPORT_LIGHT
 create mode 100644 baseconfig/s390x/CONFIG_MFD_BD9571MWV
 create mode 100644 baseconfig/s390x/CONFIG_MFD_RTSX_USB
 create mode 100644 baseconfig/s390x/CONFIG_MFD_TPS68470
 create mode 100644 baseconfig/s390x/CONFIG_MFD_VIPERBOARD
 delete mode 100644 baseconfig/s390x/CONFIG_PARPORT
 create mode 100644 baseconfig/s390x/CONFIG_VMCP_CMA_SIZE

(limited to 'baseconfig/s390x')

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
-- 
cgit