summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/board-palmz71.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-16 10:02:11 +0400
committerOlof Johansson <olof@lixom.net>2011-12-16 10:02:11 +0400
commit017c899c2db3da481cc174049e47307ed3aba530 (patch)
treed2e55932579421d0196ac63c45bad1de8dbfa5eb /arch/arm/mach-omap1/board-palmz71.c
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff)
parentc97136307c2cd336a3ee68cc0890b0f55d01d2d4 (diff)
downloadlinux-017c899c2db3da481cc174049e47307ed3aba530.tar.xz
Merge branch 'omap/soc' into next/soc
Diffstat (limited to 'arch/arm/mach-omap1/board-palmz71.c')
-rw-r--r--arch/arm/mach-omap1/board-palmz71.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index 42061573e380..df6d15e68aad 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -41,7 +41,7 @@
#include <plat/board.h>
#include <plat/irda.h>
#include <plat/keypad.h>
-#include <plat/common.h>
+#include "common.h"
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>