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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
net
/
irda
/
sa1100_ir.c
diff --git
a/drivers/net/irda/sa1100_ir.c
b/drivers/net/irda/sa1100_ir.c
index
ccde582
..
d302bcf
100644
(file)
--- a/
drivers/net/irda/sa1100_ir.c
+++ b/
drivers/net/irda/sa1100_ir.c
@@
-36,7
+36,7
@@
#include <net/irda/irda_device.h>
#include <asm/irq.h>
-#include <
asm
/dma.h>
+#include <
mach
/dma.h>
#include <mach/hardware.h>
#include <asm/mach/irda.h>