summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2006-06-25 00:22:35 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-06-25 00:22:35 +0400
commitc9b949a734adef5d05cbaa0b0546b924ca517155 (patch)
tree030a98d23fd379139efd1d30f0c8fe885ceb0ca6 /arch/arm
parenta019f4a9a7b4ec4986918e9aefa06815cf77b714 (diff)
downloadlinux-c9b949a734adef5d05cbaa0b0546b924ca517155.tar.xz
[ARM] 3647/1: S3C24XX: add Osiris to the list of simtec pm machines
Patch from Ben Dooks Enable power management for Simtec Osiris Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c2410/pm-simtec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/pm-simtec.c b/arch/arm/mach-s3c2410/pm-simtec.c
index 4c7ccef6c207..7b244566a436 100644
--- a/arch/arm/mach-s3c2410/pm-simtec.c
+++ b/arch/arm/mach-s3c2410/pm-simtec.c
@@ -48,7 +48,8 @@ static __init int pm_simtec_init(void)
/* check which machine we are running on */
- if (!machine_is_bast() && !machine_is_vr1000() && !machine_is_anubis())
+ if (!machine_is_bast() && !machine_is_vr1000() &&
+ !machine_is_anubis() && !machine_is_osiris())
return 0;
printk(KERN_INFO "Simtec Board Power Manangement" COPYRIGHT "\n");