projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-cpufreq'
[cascardo/linux.git]
/
drivers
/
irqchip
/
irq-mxs.c
diff --git
a/drivers/irqchip/irq-mxs.c
b/drivers/irqchip/irq-mxs.c
index
04bf97b
..
1faf812
100644
(file)
--- a/
drivers/irqchip/irq-mxs.c
+++ b/
drivers/irqchip/irq-mxs.c
@@
-19,6
+19,7
@@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/irq.h>
+#include <linux/irqchip.h>
#include <linux/irqdomain.h>
#include <linux/io.h>
#include <linux/of.h>
#include <linux/irqdomain.h>
#include <linux/io.h>
#include <linux/of.h>
@@
-27,8
+28,6
@@
#include <linux/stmp_device.h>
#include <asm/exception.h>
#include <linux/stmp_device.h>
#include <asm/exception.h>
-#include "irqchip.h"
-
#define HW_ICOLL_VECTOR 0x0000
#define HW_ICOLL_LEVELACK 0x0010
#define HW_ICOLL_CTRL 0x0020
#define HW_ICOLL_VECTOR 0x0000
#define HW_ICOLL_LEVELACK 0x0010
#define HW_ICOLL_CTRL 0x0020