git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap1
/
fpga.c
diff --git
a/arch/arm/mach-omap1/fpga.c
b/arch/arm/mach-omap1/fpga.c
index 4f2b8a7adb19a3ff8fb1673e21b3c3e9752de567..5cfce1636da0d27e9fbe2e845342813f2206760a 100644
(file)
--- a/
arch/arm/mach-omap1/fpga.c
+++ b/
arch/arm/mach-omap1/fpga.c
@@
-27,7
+27,7
@@
#include <asm/irq.h>
#include <asm/mach/irq.h>
-#include <
mach
/fpga.h>
+#include <
plat
/fpga.h>
#include <mach/gpio.h>
static void fpga_mask_irq(unsigned int irq)