5 files changed, 14 insertions, 14 deletions
diff --git a/target/linux/generic/config-3.3 b/target/linux/generic/config-3.3
index 4b339218b..8b9e5ad37 100644
--- a/target/linux/generic/config-3.3
+++ b/target/linux/generic/config-3.3
@@ -378,8 +378,8 @@ CONFIG_CAVIUM_OCTEON_HELPER=y
 # CONFIG_CEPH_FS is not set
 # CONFIG_CEPH_LIB is not set
 # CONFIG_CFG80211 is not set
-# CONFIG_CGROUP_DEBUG is not set
 # CONFIG_CGROUPS is not set
+# CONFIG_CGROUP_DEBUG is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_MAX8903 is not set
diff --git a/target/linux/generic/config-3.6 b/target/linux/generic/config-3.6
index 5ca5995ed..090346fcd 100644
--- a/target/linux/generic/config-3.6
+++ b/target/linux/generic/config-3.6
@@ -390,8 +390,8 @@ CONFIG_CAVIUM_OCTEON_HELPER=y
 # CONFIG_CEPH_FS is not set
 # CONFIG_CEPH_LIB is not set
 # CONFIG_CFG80211 is not set
-# CONFIG_CGROUP_DEBUG is not set
 # CONFIG_CGROUPS is not set
+# CONFIG_CGROUP_DEBUG is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_MAX8903 is not set
diff --git a/target/linux/generic/config-3.7 b/target/linux/generic/config-3.7
index 13d6de7e5..b761d6c8a 100644
--- a/target/linux/generic/config-3.7
+++ b/target/linux/generic/config-3.7
@@ -396,8 +396,8 @@ CONFIG_CAVIUM_OCTEON_HELPER=y
 # CONFIG_CEPH_FS is not set
 # CONFIG_CEPH_LIB is not set
 # CONFIG_CFG80211 is not set
-# CONFIG_CGROUP_DEBUG is not set
 # CONFIG_CGROUPS is not set
+# CONFIG_CGROUP_DEBUG is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_MAX8903 is not set
diff --git a/target/linux/generic/config-3.8 b/target/linux/generic/config-3.8
index f45bb1f4a..443ce6d7e 100644
--- a/target/linux/generic/config-3.8
+++ b/target/linux/generic/config-3.8
@@ -112,11 +112,11 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_ARCH_ZYNQ is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM_ARCH_TIMER is not set
+# CONFIG_ARM_AT91_ETHER is not set
 CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 # CONFIG_ARM_ERRATA_411920 is not set
 # CONFIG_ARM_ERRATA_775420 is not set
-# CONFIG_ARM_AT91_ETHER is not set
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 # CONFIG_ARM_UNWIND is not set
 # CONFIG_ARM_VIRT_EXT is not set
@@ -206,8 +206,8 @@ CONFIG_BASE_SMALL=0
 # CONFIG_BCM63XX_PHY is not set
 # CONFIG_BCM87XX_PHY is not set
 # CONFIG_BCMA is not set
-CONFIG_BCMA_POSSIBLE=y
 # CONFIG_BCMA_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
 # CONFIG_BCM_WIMAX is not set
 # CONFIG_BDI_SWITCH is not set
 # CONFIG_BE2ISCSI is not set
@@ -400,8 +400,8 @@ CONFIG_CAVIUM_OCTEON_HELPER=y
 # CONFIG_CEPH_FS is not set
 # CONFIG_CEPH_LIB is not set
 # CONFIG_CFG80211 is not set
-# CONFIG_CGROUP_DEBUG is not set
 # CONFIG_CGROUPS is not set
+# CONFIG_CGROUP_DEBUG is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_MAX8903 is not set
@@ -597,8 +597,8 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_DEBUG_SEMIHOSTING is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_SHIRQ is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1567,8 +1567,8 @@ CONFIG_MFD_SUPPORT=y
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS65217 is not set
@@ -1902,9 +1902,9 @@ CONFIG_NET_CLS_IND=y
 CONFIG_NET_CORE=y
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_DSA is not set
+# CONFIG_NET_DSA_MV88E6060 is not set
 # CONFIG_NET_DSA_MV88E6123_61_65 is not set
 # CONFIG_NET_DSA_MV88E6131 is not set
-# CONFIG_NET_DSA_MV88E6060 is not set
 # CONFIG_NET_DSA_MV88E6XXX is not set
 # CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
 # CONFIG_NET_DSA_TAG_DSA is not set
@@ -2338,9 +2338,9 @@ CONFIG_PPP_FILTER=y
 CONFIG_PPP_MULTILINK=y
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_PPS is not set
+# CONFIG_PPS_CLIENT_GPIO is not set
 # CONFIG_PPS_CLIENT_KTIMER is not set
 # CONFIG_PPS_CLIENT_LDISC is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
 # CONFIG_PPS_DEBUG is not set
 # CONFIG_PPTP is not set
 # CONFIG_PREEMPT is not set
@@ -2781,9 +2781,9 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=2
 # CONFIG_SERIAL_8250_PCI is not set
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-# CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_ARC is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
@@ -2802,9 +2802,9 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_UARTLITE is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIO is not set
-# CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_ALTERA_PS2 is not set
 # CONFIG_SERIO_AMBAKMI is not set
+# CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_SERIO_LIBPS2 is not set
 # CONFIG_SERIO_PARKBD is not set
@@ -3355,8 +3355,8 @@ CONFIG_USB_GADGET_VBUS_DRAW=2
 # CONFIG_USB_NET2272 is not set
 # CONFIG_USB_NET_AX8817X is not set
 # CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_MBIM is not set
 # CONFIG_USB_NET_CDC_EEM is not set
+# CONFIG_USB_NET_CDC_MBIM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
 # CONFIG_USB_NET_CDC_SUBSET is not set
 # CONFIG_USB_NET_CX82310_ETH is not set
diff --git a/target/linux/mvebu/config-default b/target/linux/mvebu/config-default
index e3b4b3a22..eddfff789 100644
--- a/target/linux/mvebu/config-default
+++ b/target/linux/mvebu/config-default
@@ -228,10 +228,10 @@ CONFIG_PLAT_VERSATILE_CLCD=y
 CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_SCSI_DMA is not set
+CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_AMBA_PL010 is not set
 # CONFIG_SERIAL_AMBA_PL011 is not set
 CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_8250_DW=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y