git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
pm-simtec.c
diff --git
a/arch/arm/mach-s3c2410/pm-simtec.c
b/arch/arm/mach-s3c2410/pm-simtec.c
index
4c7ccef
..
7b24456
100644
(file)
--- 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 */
/* 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");
return 0;
printk(KERN_INFO "Simtec Board Power Manangement" COPYRIGHT "\n");