summaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorSteven Miao <realmz6@gmail.com>2012-12-21 14:34:16 +0800
committerBob Liu <lliubbo@gmail.com>2013-02-20 15:21:23 +0800
commit36c4723983a48525f8a3477215edabb17456eff9 (patch)
tree86e93ca56601d118ea50ef4ac7abb75e16857c4b /arch/blackfin
parent293be8de49a05ca510069e7ab2d5057c728dd155 (diff)
downloadop-kernel-dev-36c4723983a48525f8a3477215edabb17456eff9.zip
op-kernel-dev-36c4723983a48525f8a3477215edabb17456eff9.tar.gz
blackfin: pm: fix build error
Only register pm ops when defined CONFIG_PM. Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/mach-common/ints-priority.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 83ff311..6c0c681 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -1195,6 +1195,7 @@ static struct syscore_ops sec_pm_syscore_ops = {
.suspend = sec_suspend,
.resume = sec_resume,
};
+
#endif
#else
# define bfin_gpio_set_wake NULL
@@ -1596,7 +1597,10 @@ int __init init_arch_irq(void)
bfin_write_SEC_SCI(1, SEC_CCTL, SEC_CCTL_EN | SEC_CCTL_NMI_EN);
init_software_driven_irq();
+
+#ifdef CONFIG_PM
register_syscore_ops(&sec_pm_syscore_ops);
+#endif
return 0;
}
OpenPOWER on IntegriCloud