From 31a7d069fcba52fba05616b62ab0d5bed0c19351 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 13 Apr 2016 23:11:32 +0100
Subject: [PATCH] Clean up kconfig with kconfigeditor2

---
 debian/config/armhf/config.armmp            | 2 +-
 debian/config/kernelarch-mips/config.octeon | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 50e7889e3..7c711e811 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -1082,6 +1082,7 @@ CONFIG_VIRTIO_MMIO=m
 ##
 CONFIG_DA9052_WATCHDOG=m
 CONFIG_ARM_SP805_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_ORION_WATCHDOG=m
 CONFIG_SUNXI_WATCHDOG=m
@@ -1089,7 +1090,6 @@ CONFIG_TWL4030_WATCHDOG=m
 CONFIG_IMX2_WDT=m
 CONFIG_TEGRA_WATCHDOG=m
 CONFIG_BCM2835_WDT=m
-CONFIG_DW_WATCHDOG=m
 
 ##
 ## file: kernel/power/Kconfig
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index 36df78973..97170ba68 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -10,10 +10,10 @@ CONFIG_CAVIUM_OCTEON_SOC=y
 CONFIG_64BIT=y
 ## end choice
 CONFIG_SMP=y
+CONFIG_NR_CPUS=32
 CONFIG_PCI=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
-CONFIG_NR_CPUS=32
 
 ##
 ## file: arch/mips/cavium-octeon/Kconfig
@@ -39,11 +39,11 @@ CONFIG_CRYPTO_SHA512_OCTEON=m
 ##
 ## file: drivers/ata/Kconfig
 ##
-CONFIG_AHCI_OCTEON=m
 CONFIG_ATA=y
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_OCTEON=m
 CONFIG_ATA_SFF=y
 CONFIG_PATA_OCTEON_CF=y
-CONFIG_SATA_AHCI_PLATFORM=m
 
 ##
 ## file: drivers/char/hw_random/Kconfig