[ARM] 4062/1: S3C24XX: Anubis and Osiris shuld have CONFIG_PM_SIMTEC

Both CONFIG_MACH_OSIRIS and CONFIG_MACH_ANUBIS
should select CONFIG_PM_SIMTEC.

This patch moves the selection of CONFIG_PM_SIMTEC
to the machines that require it, as currently done
with other machines in the S3C2410 architecture.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 8 insertions, 2 deletions

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 9ac6b5d1fa9..eb4ec411312 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -5,6 +5,7 @@ menu "S3C24XX Implementations"
 config MACH_AML_M5900
         bool "AML M5900 Series"
         select CPU_S3C2410
+        select PM_SIMTEC if PM
         help
            Say Y here if you are using the American Microsystems M5900 Series
            <http://www.amltd.com>
@@ -12,6 +13,7 @@ config MACH_AML_M5900
 config MACH_ANUBIS
         bool "Simtec Electronics ANUBIS"
         select CPU_S3C2440
+        select PM_SIMTEC if PM
         help
           Say Y here if you are using the Simtec Electronics ANUBIS
           development system
@@ -19,6 +21,7 @@ config MACH_ANUBIS
 config MACH_OSIRIS
         bool "Simtec IM2440D20 (OSIRIS) module"
         select CPU_S3C2440
+        select PM_SIMTEC if PM
         help
           Say Y here if you are using the Simtec IM2440D20 module, also
           known as the Osiris.
@@ -26,6 +29,7 @@ config MACH_OSIRIS
 config ARCH_BAST
         bool "Simtec Electronics BAST (EB2410ITX)"
         select CPU_S3C2410
+        select PM_SIMTEC if PM
         select ISA
         help
           Say Y here if you are using the Simtec Electronics EB2410ITX
@@ -111,6 +115,7 @@ config MACH_SMDK2413
 
 config MACH_VR1000
         bool "Thorcom VR1000"
+        select PM_SIMTEC if PM
         select CPU_S3C2410
         help
           Say Y here if you are using the Thorcom VR1000 board.
@@ -297,8 +302,9 @@ config S3C2410_PM_CHECK_CHUNKSIZE
 
 config PM_SIMTEC
         bool
-        depends on PM && (ARCH_BAST || MACH_VR1000 || MACH_AML_M5900)
-        default y
+        help
+          Common power management code for systems that are
+          compatible with the Simtec style of power management
 
 config S3C2410_LOWLEVEL_UART_PORT
         int "S3C2410 UART to use for low-level messages"