summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/board-omap3touchbook.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-21 13:49:47 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-11-21 13:49:47 +0400
commit59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (patch)
tree3f3b8ec46d57bcb61a2d794a1f21bd4df01728c9 /arch/arm/mach-omap2/board-omap3touchbook.c
parente879c862fb81b986095ae7a4676b2281c2f97957 (diff)
parent3f1517a761905c55d1db71cb0afd359d74a76a6c (diff)
downloadlinux-59136ef3c596606d3eef920dc3e0fdfa2ce52c6f.tar.xz
Merge branch 'restart-cleanup' into restart
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3touchbook.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3touchbook.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index a2d0d1971e27..2741a34630b1 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -44,7 +44,7 @@
#include <asm/mach/flash.h>
#include <plat/board.h>
-#include <plat/common.h>
+#include "common.h"
#include <plat/gpmc.h>
#include <plat/nand.h>
#include <plat/usb.h>