projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-at91
/
pm.c
diff --git
a/arch/arm/mach-at91/pm.c
b/arch/arm/mach-at91/pm.c
index 530db304ec5eb9b2fdca8d3a446789bc89334884..15afb5d9271f2237e3c61acd920b2f9c6d6e0a78 100644
(file)
--- a/
arch/arm/mach-at91/pm.c
+++ b/
arch/arm/mach-at91/pm.c
@@
-212,7
+212,7
@@
static int at91_pm_enter(suspend_state_t state)
(at91_pmc_read(AT91_PMC_PCSR)
| (1 << AT91_ID_FIQ)
| (1 << AT91_ID_SYS)
- | (at91_
extern_irq
))
+ | (at91_
get_extern_irq()
))
& at91_aic_read(AT91_AIC_IMR),
state);