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 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
dma.c
diff --git
a/arch/arm/plat-omap/dma.c
b/arch/arm/plat-omap/dma.c
index
c5d0214
..
c2c05ef
100644
(file)
--- a/
arch/arm/plat-omap/dma.c
+++ b/
arch/arm/plat-omap/dma.c
@@
-24,9
+24,9
@@
#include <linux/spinlock.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <asm/system.h>
-#include <asm/irq.h>
#include <asm/hardware.h>
#include <asm/dma.h>
#include <asm/io.h>