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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop32x
/
irq.c
diff --git
a/arch/arm/mach-iop32x/irq.c
b/arch/arm/mach-iop32x/irq.c
index
2ea1e71
..
ba59b2d
100644
(file)
--- a/
arch/arm/mach-iop32x/irq.c
+++ b/
arch/arm/mach-iop32x/irq.c
@@
-16,7
+16,7
@@
#include <linux/list.h>
#include <asm/mach/irq.h>
#include <asm/irq.h>
-#include <
asm/ar
ch/hardware.h>
+#include <
ma
ch/hardware.h>
#include <asm/mach-types.h>
static u32 iop32x_mask;