From c9ac9acfb08914b971493e06b87fa4919ffc8ca2 Mon Sep 17 00:00:00 2001
From: Paul Bolle <pebolle@tiscali.nl>
Date: Thu, 21 Mar 2019 14:40:24 +0000
Subject: [PATCH] Remove three Kconfig symbols dropped before v5.0

Three Kconfig symbols were added to upstream v5.0-rc1 but dropped before
v5.0 was released (for various reasons): FB_LOGO_CENTER, RESCTRL, and
X86_RESCTRL. Remove them from our configuration generation system too.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
 configs/fedora/generic/CONFIG_FB_LOGO_CENTER  | 1 -
 configs/fedora/generic/x86/CONFIG_RESCTRL     | 1 -
 configs/fedora/generic/x86/CONFIG_X86_RESCTRL | 1 -
 kernel-aarch64-debug.config                   | 1 -
 kernel-aarch64.config                         | 1 -
 kernel-armv7hl-debug.config                   | 1 -
 kernel-armv7hl-lpae-debug.config              | 1 -
 kernel-armv7hl-lpae.config                    | 1 -
 kernel-armv7hl.config                         | 1 -
 kernel-i686-debug.config                      | 3 ---
 kernel-i686.config                            | 3 ---
 kernel-ppc64le-debug.config                   | 1 -
 kernel-ppc64le.config                         | 1 -
 kernel-s390x-debug.config                     | 1 -
 kernel-s390x.config                           | 1 -
 kernel-x86_64-debug.config                    | 3 ---
 kernel-x86_64.config                          | 3 ---
 17 files changed, 25 deletions(-)
 delete mode 100644 configs/fedora/generic/CONFIG_FB_LOGO_CENTER
 delete mode 100644 configs/fedora/generic/x86/CONFIG_RESCTRL
 delete mode 100644 configs/fedora/generic/x86/CONFIG_X86_RESCTRL

diff --git a/configs/fedora/generic/CONFIG_FB_LOGO_CENTER b/configs/fedora/generic/CONFIG_FB_LOGO_CENTER
deleted file mode 100644
index 467865002..000000000
--- a/configs/fedora/generic/CONFIG_FB_LOGO_CENTER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_LOGO_CENTER is not set
diff --git a/configs/fedora/generic/x86/CONFIG_RESCTRL b/configs/fedora/generic/x86/CONFIG_RESCTRL
deleted file mode 100644
index 1822f0b7a..000000000
--- a/configs/fedora/generic/x86/CONFIG_RESCTRL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RESCTRL=y
diff --git a/configs/fedora/generic/x86/CONFIG_X86_RESCTRL b/configs/fedora/generic/x86/CONFIG_X86_RESCTRL
deleted file mode 100644
index 81d50f7c6..000000000
--- a/configs/fedora/generic/x86/CONFIG_X86_RESCTRL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_RESCTRL=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 4e0697c74..775c0d5cb 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1734,7 +1734,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 94b587d34..130223c7f 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1718,7 +1718,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 779416ae0..d516b5296 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1789,7 +1789,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_IMX is not set
 # CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 25d592b93..d8928d09f 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1713,7 +1713,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index bc3f66676..e17d8f203 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1698,7 +1698,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 3ece3890c..ec4f9039d 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1774,7 +1774,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_IMX is not set
 # CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index beaf55e2b..dfe91a77b 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1530,7 +1530,6 @@ CONFIG_FB_I810=m
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
-# CONFIG_FB_LOGO_CENTER is not set
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX is not set
@@ -4403,7 +4402,6 @@ CONFIG_RELAY=y
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 # CONFIG_RENESAS_PHY is not set
-CONFIG_RESCTRL=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
@@ -6494,7 +6492,6 @@ CONFIG_X86_PTDUMP=y
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_RESCTRL=y
 CONFIG_X86_RESERVE_LOW=64
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_SPEEDSTEP_ICH=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 7c2ead4ff..b59b97f81 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1513,7 +1513,6 @@ CONFIG_FB_I810=m
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
-# CONFIG_FB_LOGO_CENTER is not set
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX is not set
@@ -4383,7 +4382,6 @@ CONFIG_RELAY=y
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 # CONFIG_RENESAS_PHY is not set
-CONFIG_RESCTRL=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
@@ -6473,7 +6471,6 @@ CONFIG_X86_POWERNOW_K8=m
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_RESCTRL=y
 CONFIG_X86_RESERVE_LOW=64
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_SPEEDSTEP_ICH=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index ed796c797..bdbf119d2 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1382,7 +1382,6 @@ CONFIG_FB_EFI=y
 CONFIG_FB_IBM_GXT4500=y
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
 CONFIG_FB_MATROX_G=y
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX_MILLENIUM is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index a921ba2f3..7fff95122 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1365,7 +1365,6 @@ CONFIG_FB_EFI=y
 CONFIG_FB_IBM_GXT4500=y
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
 CONFIG_FB_MATROX_G=y
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX_MILLENIUM is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 46c72feb6..197817317 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1387,7 +1387,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
 CONFIG_FB=m
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index d1727fbe6..2cad3793d 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1370,7 +1370,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
 CONFIG_FB=m
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 2bf7fb1fd..35ccdec08 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1575,7 +1575,6 @@ CONFIG_FB_I810=m
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
-# CONFIG_FB_LOGO_CENTER is not set
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX is not set
@@ -4446,7 +4445,6 @@ CONFIG_RELAY=y
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 # CONFIG_RENESAS_PHY is not set
-CONFIG_RESCTRL=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
@@ -6543,7 +6541,6 @@ CONFIG_X86_PM_TIMER=y
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_PTDUMP=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_RESCTRL=y
 CONFIG_X86_RESERVE_LOW=64
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 # CONFIG_X86_SYSFB is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index f538fa6f8..83459b6b2 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1558,7 +1558,6 @@ CONFIG_FB_I810=m
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
-# CONFIG_FB_LOGO_CENTER is not set
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX is not set
@@ -4426,7 +4425,6 @@ CONFIG_RELAY=y
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
 # CONFIG_RENESAS_PHY is not set
-CONFIG_RESCTRL=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
@@ -6522,7 +6520,6 @@ CONFIG_X86_PM_TIMER=y
 CONFIG_X86_POWERNOW_K8=m
 # CONFIG_X86_PTDUMP is not set
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_RESCTRL=y
 CONFIG_X86_RESERVE_LOW=64
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 # CONFIG_X86_SYSFB is not set