git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
pm-imx27.c
diff --git
a/arch/arm/mach-imx/pm-imx27.c
b/arch/arm/mach-imx/pm-imx27.c
index
afc17ce
..
6bf81ce
100644
(file)
--- a/
arch/arm/mach-imx/pm-imx27.c
+++ b/
arch/arm/mach-imx/pm-imx27.c
@@
-39,6
+39,9
@@
static struct platform_suspend_ops mx27_suspend_ops = {
static int __init mx27_pm_init(void)
{
static int __init mx27_pm_init(void)
{
+ if (!cpu_is_mx27())
+ return 0;
+
suspend_set_ops(&mx27_suspend_ops);
return 0;
}
suspend_set_ops(&mx27_suspend_ops);
return 0;
}