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 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
gpmc.c
diff --git
a/arch/arm/mach-omap2/gpmc.c
b/arch/arm/mach-omap2/gpmc.c
index
dbf68dc
..
f51d69b
100644
(file)
--- a/
arch/arm/mach-omap2/gpmc.c
+++ b/
arch/arm/mach-omap2/gpmc.c
@@
-18,7
+18,7
@@
#include <asm/io.h>
#include <asm/mach-types.h>
-#include <
asm/ar
ch/gpmc.h>
+#include <
ma
ch/gpmc.h>
#undef DEBUG