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 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[cascardo/linux.git]
/
arch
/
arm
/
mach-exynos
/
suspend.c
diff --git
a/arch/arm/mach-exynos/suspend.c
b/arch/arm/mach-exynos/suspend.c
index
5a7e47c
..
c169cc3
100644
(file)
--- a/
arch/arm/mach-exynos/suspend.c
+++ b/
arch/arm/mach-exynos/suspend.c
@@
-19,6
+19,7
@@
#include <linux/cpu_pm.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/cpu_pm.h>
#include <linux/io.h>
#include <linux/irq.h>
+#include <linux/irqchip.h>
#include <linux/irqdomain.h>
#include <linux/of_address.h>
#include <linux/err.h>
#include <linux/irqdomain.h>
#include <linux/of_address.h>
#include <linux/err.h>
@@
-265,7
+266,7
@@
static int __init exynos_pmu_irq_init(struct device_node *node,
return 0;
}
return 0;
}
-#define EXYNOS_PMU_IRQ(symbol, name)
OF_DECLARE_2(irqchip,
symbol, name, exynos_pmu_irq_init)
+#define EXYNOS_PMU_IRQ(symbol, name)
IRQCHIP_DECLARE(
symbol, name, exynos_pmu_irq_init)
EXYNOS_PMU_IRQ(exynos3250_pmu_irq, "samsung,exynos3250-pmu");
EXYNOS_PMU_IRQ(exynos4210_pmu_irq, "samsung,exynos4210-pmu");
EXYNOS_PMU_IRQ(exynos3250_pmu_irq, "samsung,exynos3250-pmu");
EXYNOS_PMU_IRQ(exynos4210_pmu_irq, "samsung,exynos4210-pmu");