From 5df1ad8e8b16213129fb5a176b1ba78af6635def Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Fri, 22 Jun 2018 17:55:54 +0100
Subject: [PATCH] Clean up kconfig with kconfigeditor2

Drop one long-obsolete and one automatic symbol that were wrongly
added recently.
---
 debian/config/armhf/config                    |  4 +--
 debian/config/config                          |  1 -
 debian/config/kernelarch-mips/config.boston   |  8 +++--
 .../config/kernelarch-mips/config.loongson-3  | 29 ++++++++-----------
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 8c200a262..c2d83403f 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -606,8 +606,8 @@ CONFIG_TEGRA124_EMC=y
 ##
 ## file: drivers/mfd/Kconfig
 ##
-CONFIG_MFD_AC100=y
 CONFIG_MFD_AS3722=y
+CONFIG_MFD_AC100=y
 CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_SPI=m
@@ -620,8 +620,8 @@ CONFIG_MFD_RK808=y
 CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_STMPE=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_MFD_TPS65217=m
 CONFIG_MFD_PALMAS=y
+CONFIG_MFD_TPS65217=m
 CONFIG_TWL4030_CORE=y
 CONFIG_TWL6040_CORE=y
 
diff --git a/debian/config/config b/debian/config/config
index 063f5ef54..fd6bbc390 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -7349,7 +7349,6 @@ CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
-CONFIG_SND_HDA_POWER_SAVE=y
 
 ##
 ## file: sound/pcmcia/Kconfig
diff --git a/debian/config/kernelarch-mips/config.boston b/debian/config/kernelarch-mips/config.boston
index 21f1622d5..265e7a285 100644
--- a/debian/config/kernelarch-mips/config.boston
+++ b/debian/config/kernelarch-mips/config.boston
@@ -3,10 +3,12 @@
 ##
 ## choice: System type
 CONFIG_MIPS_GENERIC=y
-CONFIG_RELOCATION_TABLE_SIZE=0x00121000
-CONFIG_MIPS_CPS=y
 ## end choice
+CONFIG_MIPS_CPS=y
+CONFIG_RELOCATION_TABLE_SIZE=0x00121000
+
 ##
-## Common Clock Framework
+## file: drivers/clk/imgtec/Kconfig
 ##
 CONFIG_COMMON_CLK_BOSTON=y
+
diff --git a/debian/config/kernelarch-mips/config.loongson-3 b/debian/config/kernelarch-mips/config.loongson-3
index ffcc8cb14..313618f88 100644
--- a/debian/config/kernelarch-mips/config.loongson-3
+++ b/debian/config/kernelarch-mips/config.loongson-3
@@ -8,34 +8,29 @@ CONFIG_MACH_LOONGSON64=y
 # CONFIG_32BIT is not set
 CONFIG_64BIT=y
 ## end choice
+CONFIG_NUMA=y
 CONFIG_SMP=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_NR_CPUS=16
-CONFIG_NUMA=y
-
-##
-## file: kernel/power/Kconfig
-##
-CONFIG_CPU_PM=y
 
 ##
 ## file: arch/mips/loongson64/Kconfig
 ##
 ## choice: Machine Type
 CONFIG_LOONGSON_MACH3X=y
-CONFIG_RS780_HPET=y
 ## end choice
-
-##
-## file: drivers/cpuidle/Kconfig
-##
-CONFIG_CPU_IDLE=y
+CONFIG_RS780_HPET=y
 
 ##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_SATA_AHCI=y
 
+##
+## file: drivers/cpuidle/Kconfig
+##
+CONFIG_CPU_IDLE=y
+
 ##
 ## file: drivers/gpu/drm/Kconfig
 ##
@@ -73,16 +68,16 @@ CONFIG_8139TOO=m
 ##
 # CONFIG_PCIEPORTBUS is not set
 
-##
-## file: drivers/rtc/Kconfig
-##
-CONFIG_RTC_DRV_CMOS=y
-
 ##
 ## file: drivers/regulator/Kconfig
 ##
 CONFIG_REGULATOR=y
 
+##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_DRV_CMOS=y
+
 ##
 ## file: drivers/tty/serial/8250/Kconfig
 ##