summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-zoom-peripherals.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-19 21:12:47 -0800
committerOlof Johansson <olof@lixom.net>2011-12-19 21:12:53 -0800
commit4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a (patch)
tree0ac643f1a0c57a88452ef017c61d325fab98d00a /arch/arm/mach-omap2/board-zoom-peripherals.c
parentf68453e076dcf140c4a7bdd385f239b1e41be983 (diff)
parent1b46f8782c2607afa1298b0c7f7fe307fc0f7a5b (diff)
Merge branch 'picoxcell/devel' into next/devel
* picoxcell/devel: (1 commit) ARM: picoxcell: implement watchdog restart
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom-peripherals.c')
-rw-r--r--arch/arm/mach-omap2/board-zoom-peripherals.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 6d0aa4fcb7c..8d7ce11cfea 100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -24,7 +24,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
-#include <plat/common.h>
+#include "common.h"
#include <plat/usb.h>
#include <mach/board-zoom.h>