On 14/9/23 10:44, Yuan Tan wrote:
Simplify malta_defconfig with POWER_RESET dependences. Regenerate malta_defconfig with 'make savedefconfig'. Suggested-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> Suggested-by: Christophe Leroy <christophe.leroy@xxxxxxxxxx> Signed-off-by: Yuan Tan <tanyuan@xxxxxxxxxxx> --- arch/mips/configs/malta_defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 7ae07d57b79a..99049e993192 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig @@ -192,7 +192,6 @@ CONFIG_CFG80211=m CONFIG_MAC80211=m CONFIG_MAC80211_MESH=y CONFIG_RFKILL=m -CONFIG_PCI=y CONFIG_DEVTMPFS=y CONFIG_CONNECTOR=m CONFIG_MTD=y @@ -284,7 +283,6 @@ CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_POWER_RESET=y -CONFIG_POWER_RESET_PIIX4_POWEROFF=y CONFIG_POWER_RESET_SYSCON=y # CONFIG_HWMON is not set CONFIG_FB=y
IMHO this should be squashed with the previous patch, to keep it "atomic", easing reverts or cherry-picks during backports.