diff options
author | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 14:55:35 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 14:55:53 -0500 |
commit | 2290c0d06d82faee87b1ab2d9d4f7bf81ef64379 (patch) | |
tree | e075e4d5534193f28e6059904f61e5ca03958d3c /arch/arm/mach-pxa/irq.c | |
parent | 4da669a2e3e5bc70b30a0465f3641528681b5f77 (diff) | |
parent | 52e4c2a05256cb83cda12f3c2137ab1533344edb (diff) |
Merge branch 'master' into for-next
Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.
Diffstat (limited to 'arch/arm/mach-pxa/irq.c')
-rw-r--r-- | arch/arm/mach-pxa/irq.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c index ca607571782..532c5d3a97d 100644 --- a/arch/arm/mach-pxa/irq.c +++ b/arch/arm/mach-pxa/irq.c | |||
@@ -11,7 +11,6 @@ | |||
11 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
13 | */ | 13 | */ |
14 | |||
15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
17 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
@@ -23,11 +22,11 @@ | |||
23 | 22 | ||
24 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
25 | #include <mach/irqs.h> | 24 | #include <mach/irqs.h> |
26 | #include <mach/gpio.h> | 25 | #include <mach/gpio-pxa.h> |
27 | 26 | ||
28 | #include "generic.h" | 27 | #include "generic.h" |
29 | 28 | ||
30 | #define IRQ_BASE (void __iomem *)io_p2v(0x40d00000) | 29 | #define IRQ_BASE io_p2v(0x40d00000) |
31 | 30 | ||
32 | #define ICIP (0x000) | 31 | #define ICIP (0x000) |
33 | #define ICMR (0x004) | 32 | #define ICMR (0x004) |
@@ -65,7 +64,7 @@ static inline void __iomem *irq_base(int i) | |||
65 | 0x40d00130, | 64 | 0x40d00130, |
66 | }; | 65 | }; |
67 | 66 | ||
68 | return (void __iomem *)io_p2v(phys_base[i]); | 67 | return io_p2v(phys_base[i]); |
69 | } | 68 | } |
70 | 69 | ||
71 | void pxa_mask_irq(struct irq_data *d) | 70 | void pxa_mask_irq(struct irq_data *d) |