From 079e0f545a491903a6acb0dc783d162ae84a2e6c Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Wed, 4 Dec 2019 13:38:43 -0500
Subject: Sync up stabilization with f31

---
 configs/fedora/generic/s390x/CONFIG_64BIT          | 1 -
 configs/fedora/generic/s390x/CONFIG_FMC            | 1 -
 configs/fedora/generic/s390x/CONFIG_HMC_DRV        | 1 +
 configs/fedora/generic/s390x/CONFIG_INFINIBAND_NES | 1 -
 configs/fedora/generic/s390x/CONFIG_MISDN_HFCMULTI | 1 -
 configs/fedora/generic/s390x/CONFIG_SCLP_ASYNC     | 1 -
 configs/fedora/generic/s390x/CONFIG_SCLP_ASYNC_ID  | 1 -
 7 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 configs/fedora/generic/s390x/CONFIG_64BIT
 delete mode 100644 configs/fedora/generic/s390x/CONFIG_FMC
 create mode 100644 configs/fedora/generic/s390x/CONFIG_HMC_DRV
 delete mode 100644 configs/fedora/generic/s390x/CONFIG_INFINIBAND_NES
 delete mode 100644 configs/fedora/generic/s390x/CONFIG_MISDN_HFCMULTI
 delete mode 100644 configs/fedora/generic/s390x/CONFIG_SCLP_ASYNC
 delete mode 100644 configs/fedora/generic/s390x/CONFIG_SCLP_ASYNC_ID

(limited to 'configs/fedora/generic/s390x')

diff --git a/configs/fedora/generic/s390x/CONFIG_64BIT b/configs/fedora/generic/s390x/CONFIG_64BIT
deleted file mode 100644
index 06a94e48b..000000000
--- a/configs/fedora/generic/s390x/CONFIG_64BIT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_64BIT=y
diff --git a/configs/fedora/generic/s390x/CONFIG_FMC b/configs/fedora/generic/s390x/CONFIG_FMC
deleted file mode 100644
index 674cd4432..000000000
--- a/configs/fedora/generic/s390x/CONFIG_FMC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FMC is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_HMC_DRV b/configs/fedora/generic/s390x/CONFIG_HMC_DRV
new file mode 100644
index 000000000..fc68dc34b
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_HMC_DRV
@@ -0,0 +1 @@
+CONFIG_HMC_DRV=m
diff --git a/configs/fedora/generic/s390x/CONFIG_INFINIBAND_NES b/configs/fedora/generic/s390x/CONFIG_INFINIBAND_NES
deleted file mode 100644
index eee505590..000000000
--- a/configs/fedora/generic/s390x/CONFIG_INFINIBAND_NES
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INFINIBAND_NES is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_MISDN_HFCMULTI b/configs/fedora/generic/s390x/CONFIG_MISDN_HFCMULTI
deleted file mode 100644
index c09baa6b4..000000000
--- a/configs/fedora/generic/s390x/CONFIG_MISDN_HFCMULTI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MISDN_HFCMULTI is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_SCLP_ASYNC b/configs/fedora/generic/s390x/CONFIG_SCLP_ASYNC
deleted file mode 100644
index b4408b75a..000000000
--- a/configs/fedora/generic/s390x/CONFIG_SCLP_ASYNC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCLP_ASYNC=m
diff --git a/configs/fedora/generic/s390x/CONFIG_SCLP_ASYNC_ID b/configs/fedora/generic/s390x/CONFIG_SCLP_ASYNC_ID
deleted file mode 100644
index c99c14855..000000000
--- a/configs/fedora/generic/s390x/CONFIG_SCLP_ASYNC_ID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCLP_ASYNC_ID="000000000"
-- 
cgit