2 files changed, 18 insertions, 18 deletions

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index e94ee6b02ae0..d306aa1d2dfd 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -2,6 +2,24 @@ if ARCH_OMAP2PLUS
 
 menu "TI OMAP2/3/4 Specific Features"
 
+config ARCH_OMAP2
+        bool "TI OMAP2"
+        depends on ARCH_OMAP2PLUS
+        select CPU_V6
+
+config ARCH_OMAP3
+        bool "TI OMAP3"
+        depends on ARCH_OMAP2PLUS
+        select CPU_V7
+        select USB_ARCH_HAS_EHCI
+        select ARM_L1_CACHE_SHIFT_6
+
+config ARCH_OMAP4
+        bool "TI OMAP4"
+        depends on ARCH_OMAP2PLUS
+        select CPU_V7
+        select ARM_GIC
+
 comment "OMAP Core Type"
         depends on ARCH_OMAP2
 
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index a4e87278b8f1..b7a3d80c539f 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -21,24 +21,6 @@ config ARCH_OMAP2PLUS
         help
           "Systems based on omap24xx, omap34xx or omap44xx"
 
-config ARCH_OMAP2
-        bool "TI OMAP2"
-        depends on ARCH_OMAP2PLUS
-        select CPU_V6
-
-config ARCH_OMAP3
-        bool "TI OMAP3"
-        depends on ARCH_OMAP2PLUS
-        select CPU_V7
-        select USB_ARCH_HAS_EHCI
-        select ARM_L1_CACHE_SHIFT_6
-
-config ARCH_OMAP4
-        bool "TI OMAP4"
-        depends on ARCH_OMAP2PLUS
-        select CPU_V7
-        select ARM_GIC
-
 endchoice
 
 comment "OMAP Feature Selections"