projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[cascardo/linux.git]
/
arch
/
arm
/
plat-samsung
/
s5p-irq-pm.c
diff --git
a/arch/arm/plat-samsung/s5p-irq-pm.c
b/arch/arm/plat-samsung/s5p-irq-pm.c
index
7c1e3b7
..
5914980
100644
(file)
--- a/
arch/arm/plat-samsung/s5p-irq-pm.c
+++ b/
arch/arm/plat-samsung/s5p-irq-pm.c
@@
-22,7
+22,10
@@
#include <mach/map.h>
#include <mach/regs-gpio.h>
+
+#ifndef CONFIG_ARCH_EXYNOS
#include <mach/regs-irq.h>
+#endif
/* state for IRQs over sleep */