projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'pm-core' and 'pm-domains'
[linux-2.6-block.git]
/
arch
/
arm
/
mach-omap1
/
board-palmz71.c
diff --git
a/arch/arm/mach-omap1/board-palmz71.c
b/arch/arm/mach-omap1/board-palmz71.c
index 87ec04ae40dd691f29aa3f014f3fbe4269b5a394..aaf741b0aff61d153b6cb9f6a64fda6b198c4de2 100644
(file)
--- a/
arch/arm/mach-omap1/board-palmz71.c
+++ b/
arch/arm/mach-omap1/board-palmz71.c
@@
-36,7
+36,7
@@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
-#include
<mach/flash.h>
+#include
"flash.h"
#include <mach/mux.h>
#include <linux/omap-dma.h>
#include <mach/tc.h>