diff --git a/[refs] b/[refs] index 8f158ed35126..a631b42dcd90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba4691a4f4ae66b3266751065af0a341e63b5105 +refs/heads/master: 3375a43f97504218d848c26ff75da6d160c94120 diff --git a/trunk/arch/blackfin/mach-common/ints-priority.c b/trunk/arch/blackfin/mach-common/ints-priority.c index 1aac5ebaace4..c4b94c42db83 100644 --- a/trunk/arch/blackfin/mach-common/ints-priority.c +++ b/trunk/arch/blackfin/mach-common/ints-priority.c @@ -1138,6 +1138,7 @@ void bfin_pint_resume(void) } } +#ifdef CONFIG_BF60x static int sec_suspend(void) { u32 bank; @@ -1164,6 +1165,7 @@ static struct syscore_ops sec_pm_syscore_ops = { .suspend = sec_suspend, .resume = sec_resume, }; +#endif #else # define bfin_gpio_set_wake NULL #endif