diff --git a/[refs] b/[refs] index 398882fea6cf..8f158ed35126 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d49cdf84096392359a4d532733ab5a165d24bb0d +refs/heads/master: ba4691a4f4ae66b3266751065af0a341e63b5105 diff --git a/trunk/arch/blackfin/mach-common/pm.c b/trunk/arch/blackfin/mach-common/pm.c index 4878f36066c5..87bfe549ad3f 100644 --- a/trunk/arch/blackfin/mach-common/pm.c +++ b/trunk/arch/blackfin/mach-common/pm.c @@ -172,7 +172,9 @@ int bfin_pm_suspend_mem_enter(void) bfin_gpio_pm_hibernate_suspend(); +#if BFIN_GPIO_PINT bfin_pint_suspend(); +#endif #if defined(CONFIG_BFIN_EXTMEM_WRITEBACK) || defined(CONFIG_BFIN_L2_WRITEBACK) flushinv_all_dcache(); @@ -192,7 +194,9 @@ int bfin_pm_suspend_mem_enter(void) _enable_icplb(); _enable_dcplb(); +#if BFIN_GPIO_PINT bfin_pint_resume(); +#endif bfin_gpio_pm_hibernate_restore(); blackfin_dma_resume();