diff options
author | Steven Miao <realmz6@gmail.com> | 2012-12-21 01:34:16 -0500 |
---|---|---|
committer | Bob Liu <lliubbo@gmail.com> | 2013-02-20 02:21:23 -0500 |
commit | 36c4723983a48525f8a3477215edabb17456eff9 (patch) | |
tree | 86e93ca56601d118ea50ef4ac7abb75e16857c4b /arch | |
parent | 293be8de49a05ca510069e7ab2d5057c728dd155 (diff) |
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')
-rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 4 |
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 83ff311fd6ea..6c0c6816a51a 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 = { | |||
1195 | .suspend = sec_suspend, | 1195 | .suspend = sec_suspend, |
1196 | .resume = sec_resume, | 1196 | .resume = sec_resume, |
1197 | }; | 1197 | }; |
1198 | |||
1198 | #endif | 1199 | #endif |
1199 | #else | 1200 | #else |
1200 | # define bfin_gpio_set_wake NULL | 1201 | # define bfin_gpio_set_wake NULL |
@@ -1596,7 +1597,10 @@ int __init init_arch_irq(void) | |||
1596 | bfin_write_SEC_SCI(1, SEC_CCTL, SEC_CCTL_EN | SEC_CCTL_NMI_EN); | 1597 | bfin_write_SEC_SCI(1, SEC_CCTL, SEC_CCTL_EN | SEC_CCTL_NMI_EN); |
1597 | 1598 | ||
1598 | init_software_driven_irq(); | 1599 | init_software_driven_irq(); |
1600 | |||
1601 | #ifdef CONFIG_PM | ||
1599 | register_syscore_ops(&sec_pm_syscore_ops); | 1602 | register_syscore_ops(&sec_pm_syscore_ops); |
1603 | #endif | ||
1600 | 1604 | ||
1601 | return 0; | 1605 | return 0; |
1602 | } | 1606 | } |