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 branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
[linux-2.6-block.git]
/
arch
/
arm
/
mach-omap2
/
board-omap3pandora.c
diff --git
a/arch/arm/mach-omap2/board-omap3pandora.c
b/arch/arm/mach-omap2/board-omap3pandora.c
index 78dd2a7fe6e6e664609474d9bb8ec973c3651b5b..1d10736c6d3c1d358cbef88468294cb7d4f1834b 100644
(file)
--- a/
arch/arm/mach-omap2/board-omap3pandora.c
+++ b/
arch/arm/mach-omap2/board-omap3pandora.c
@@
-45,7
+45,7
@@
#include <mach/hardware.h>
#include <plat/mcspi.h>
#include <plat/usb.h>
-#include <
plat/display
.h>
+#include <
video/omapdss
.h>
#include <plat/nand.h>
#include "mux.h"