[ARM] 5142/1: pxa: move move zaurus declarations to proper place

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index ef7271e..01d23e5 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -58,6 +58,57 @@ config PXA_SHARPSL
          SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
          handheld computer.
 
+config MACH_POODLE
+       bool "Enable Sharp SL-5600 (Poodle) Support"
+       depends on PXA_SHARPSL
+       select PXA25x
+       select SHARP_LOCOMO
+       select PXA_SSP
+
+config MACH_CORGI
+       bool "Enable Sharp SL-C700 (Corgi) Support"
+       depends on PXA_SHARPSL
+       select PXA25x
+       select PXA_SHARP_C7xx
+
+config MACH_SHEPHERD
+       bool "Enable Sharp SL-C750 (Shepherd) Support"
+       depends on PXA_SHARPSL
+       select PXA25x
+       select PXA_SHARP_C7xx
+
+config MACH_HUSKY
+       bool "Enable Sharp SL-C760 (Husky) Support"
+       depends on PXA_SHARPSL
+       select PXA25x
+       select PXA_SHARP_C7xx
+
+config MACH_AKITA
+       bool "Enable Sharp SL-1000 (Akita) Support"
+       depends on PXA_SHARPSL
+       select PXA27x
+       select PXA_SHARP_Cxx00
+       select MACH_SPITZ
+       select I2C
+       select I2C_PXA
+
+config MACH_SPITZ
+       bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
+       depends on PXA_SHARPSL
+       select PXA27x
+       select PXA_SHARP_Cxx00
+
+config MACH_BORZOI
+       bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
+       depends on PXA_SHARPSL
+       select PXA27x
+       select PXA_SHARP_Cxx00
+
+config MACH_TOSA
+       bool "Enable Sharp SL-6000x (Tosa) Support"
+       depends on PXA_SHARPSL
+       select PXA25x
+
 config ARCH_PXA_ESERIES
        bool "PXA based Toshiba e-series PDAs"
        select PXA25x
@@ -199,57 +250,6 @@ endif
 
 endmenu
 
-config MACH_POODLE
-       bool "Enable Sharp SL-5600 (Poodle) Support"
-       depends on PXA_SHARPSL
-       select PXA25x
-       select SHARP_LOCOMO
-       select PXA_SSP
-
-config MACH_CORGI
-       bool "Enable Sharp SL-C700 (Corgi) Support"
-       depends on PXA_SHARPSL
-       select PXA25x
-       select PXA_SHARP_C7xx
-
-config MACH_SHEPHERD
-       bool "Enable Sharp SL-C750 (Shepherd) Support"
-       depends on PXA_SHARPSL
-       select PXA25x
-       select PXA_SHARP_C7xx
-
-config MACH_HUSKY
-       bool "Enable Sharp SL-C760 (Husky) Support"
-       depends on PXA_SHARPSL
-       select PXA25x
-       select PXA_SHARP_C7xx
-
-config MACH_AKITA
-       bool "Enable Sharp SL-1000 (Akita) Support"
-       depends on PXA_SHARPSL
-       select PXA27x
-       select PXA_SHARP_Cxx00
-       select MACH_SPITZ
-       select I2C
-       select I2C_PXA
-
-config MACH_SPITZ
-       bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
-       depends on PXA_SHARPSL
-       select PXA27x
-       select PXA_SHARP_Cxx00
-
-config MACH_BORZOI
-       bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
-       depends on PXA_SHARPSL
-       select PXA27x
-       select PXA_SHARP_Cxx00
-
-config MACH_TOSA
-       bool "Enable Sharp SL-6000x (Tosa) Support"
-       depends on PXA_SHARPSL
-       select PXA25x
-
 config PXA25x
        bool
        help