git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
irq.c
diff --git
a/arch/arm/mach-pxa/irq.c
b/arch/arm/mach-pxa/irq.c
index
b09e848
..
8d9200f
100644
(file)
--- a/
arch/arm/mach-pxa/irq.c
+++ b/
arch/arm/mach-pxa/irq.c
@@
-11,7
+11,6
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-
#include <linux/init.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/interrupt.h>
@@
-19,9
+18,11
@@
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/io.h>
#include <linux/irq.h>
+#include <asm/exception.h>
+
#include <mach/hardware.h>
#include <mach/irqs.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
-#include <mach/gpio.h>
+#include <mach/gpio
-pxa
.h>
#include "generic.h"
#include "generic.h"