1 files changed, 3 insertions, 17 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 756711f3095c..f505f9ec792d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -6,6 +6,7 @@ config ARM
         select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
         select ARCH_HAVE_CUSTOM_GPIO_H
         select ARCH_MIGHT_HAVE_PC_PARPORT
+        select ARCH_SUPPORTS_ATOMIC_RMW
         select ARCH_USE_BUILTIN_BSWAP
         select ARCH_USE_CMPXCHG_LOCKREF
         select ARCH_WANT_IPC_PARSE_VERSION
@@ -528,21 +529,6 @@ config ARCH_DOVE
         help
           Support for the Marvell Dove SoC 88AP510
 
-config ARCH_KIRKWOOD
-        bool "Marvell Kirkwood"
-        select ARCH_REQUIRE_GPIOLIB
-        select CPU_FEROCEON
-        select GENERIC_CLOCKEVENTS
-        select MVEBU_MBUS
-        select PCI
-        select PCI_QUIRKS
-        select PINCTRL
-        select PINCTRL_KIRKWOOD
-        select PLAT_ORION_LEGACY
-        help
-          Support for the following Marvell Kirkwood series SoCs:
-          88F6180, 88F6192 and 88F6281.
-
 config ARCH_MV78XX0
         bool "Marvell MV78xx0"
         select ARCH_REQUIRE_GPIOLIB
@@ -896,8 +882,6 @@ source "arch/arm/mach-ixp4xx/Kconfig"
 
 source "arch/arm/mach-keystone/Kconfig"
 
-source "arch/arm/mach-kirkwood/Kconfig"
-
 source "arch/arm/mach-ks8695/Kconfig"
 
 source "arch/arm/mach-msm/Kconfig"
@@ -908,6 +892,8 @@ source "arch/arm/mach-mv78xx0/Kconfig"
 
 source "arch/arm/mach-imx/Kconfig"
 
+source "arch/arm/mach-mediatek/Kconfig"
+
 source "arch/arm/mach-mxs/Kconfig"
 
 source "arch/arm/mach-netx/Kconfig"