projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'iwlwifi-for-kalle-2015-05-28' of https://git.kernel.org/pub/scm/linux...
[deliverable/linux.git]
/
arch
/
blackfin
/
mach-common
/
pm.c
diff --git
a/arch/blackfin/mach-common/pm.c
b/arch/blackfin/mach-common/pm.c
index 1387a94bcfd5a30e68fb00d9e293eea7db710d98..a66d979ec6512b24857f98227e01412a3ea83a75 100644
(file)
--- a/
arch/blackfin/mach-common/pm.c
+++ b/
arch/blackfin/mach-common/pm.c
@@
-14,6
+14,7
@@
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/irq.h>
+#include <linux/delay.h>
#include <asm/cplb.h>
#include <asm/gpio.h>
#include <asm/cplb.h>
#include <asm/gpio.h>
@@
-180,6
+181,7
@@
int bfin_pm_suspend_mem_enter(void)
#if defined(CONFIG_BFIN_EXTMEM_WRITEBACK) || defined(CONFIG_BFIN_L2_WRITEBACK)
flushinv_all_dcache();
#if defined(CONFIG_BFIN_EXTMEM_WRITEBACK) || defined(CONFIG_BFIN_L2_WRITEBACK)
flushinv_all_dcache();
+ udelay(1);
#endif
_disable_dcplb();
_disable_icplb();
#endif
_disable_dcplb();
_disable_icplb();
This page took
0.025185 seconds
and
5
git commands to generate.