projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap1
/
board-h2.c
diff --git
a/arch/arm/mach-omap1/board-h2.c
b/arch/arm/mach-omap1/board-h2.c
index
8340d68
..
cd146ed
100644
(file)
--- a/
arch/arm/mach-omap1/board-h2.c
+++ b/
arch/arm/mach-omap1/board-h2.c
@@
-42,7
+42,7
@@
#include <linux/omap-dma.h>
#include <mach/tc.h>
#include <linux/platform_data/keypad-omap.h>
-#include
<mach/flash.h>
+#include
"flash.h"
#include <mach/hardware.h>
#include <mach/usb.h>