diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-06-24 22:21:49 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-24 22:21:49 +0100 |
| commit | e11c910b5bcc1dbc38a5af7a24be2812fc956b27 (patch) | |
| tree | 38fb4c1b23bf2085cd0b05db9c85e3b91819130f /arch/arm/mach-s3c2410/pm-simtec.c | |
| parent | c1e08adc86f886ba0ad7c8f29c240d6e833e7ec7 (diff) | |
| parent | c9b949a734adef5d05cbaa0b0546b924ca517155 (diff) | |
Merge S3C24xx branch
Diffstat (limited to 'arch/arm/mach-s3c2410/pm-simtec.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/pm-simtec.c | 3 |
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 4c7ccef6c20..7b244566a43 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"); |