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 'for-2.6.37' into HEAD
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-flash.c
diff --git
a/arch/arm/mach-omap2/board-flash.c
b/arch/arm/mach-omap2/board-flash.c
index
ac834aa
..
fd38c05
100644
(file)
--- a/
arch/arm/mach-omap2/board-flash.c
+++ b/
arch/arm/mach-omap2/board-flash.c
@@
-21,7
+21,8
@@
#include <plat/nand.h>
#include <plat/onenand.h>
#include <plat/tc.h>
-#include <mach/board-flash.h>
+
+#include "board-flash.h"
#define REG_FPGA_REV 0x10
#define REG_FPGA_DIP_SWITCH_INPUT2 0x60