summaryrefslogtreecommitdiffstats
path: root/kernel-i686-debug.config
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2019-03-21 14:40:24 +0000
committerJeremy Cline <jcline@redhat.com>2019-03-21 15:12:50 +0000
commitc9ac9acfb08914b971493e06b87fa4919ffc8ca2 (patch)
tree557d1e27a8f6e82d930ed9c6de04a505c30f1f72 /kernel-i686-debug.config
parent03cb47494c67632be0f46032cffbd861126fa033 (diff)
downloadkernel-c9ac9acfb08914b971493e06b87fa4919ffc8ca2.tar.gz
kernel-c9ac9acfb08914b971493e06b87fa4919ffc8ca2.tar.xz
kernel-c9ac9acfb08914b971493e06b87fa4919ffc8ca2.zip
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>
Diffstat (limited to 'kernel-i686-debug.config')
-rw-r--r--kernel-i686-debug.config3
1 files changed, 0 insertions, 3 deletions
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