summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c64xx/mach-hmt.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-20 16:51:38 +0400
committerArnd Bergmann <arnd@arndb.de>2011-10-20 16:51:38 +0400
commit1faca4ced8594d3586302e8d1788a60932f2bbca (patch)
tree5130aaa4803a322f3d1f0ff6406f047ed0dba475 /arch/arm/mach-s3c64xx/mach-hmt.c
parent112d17d6f75b93e1dcaec2e2232a411148b3bf71 (diff)
parent6b6844dd54e4196dd9818bc63b319f93c37a08be (diff)
downloadlinux-1faca4ced8594d3586302e8d1788a60932f2bbca.tar.xz
Merge branch 'samsung/devel' of git+ssh://git.linaro.org/home/arndbergmann/public_git/arm-soc into next/devel2
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-hmt.c')
-rw-r--r--arch/arm/mach-s3c64xx/mach-hmt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c
index b3d93cc8dde0..61f4fde088e9 100644
--- a/arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/arch/arm/mach-s3c64xx/mach-hmt.c
@@ -37,7 +37,7 @@
#include <plat/fb.h>
#include <plat/nand.h>
-#include <mach/s3c6410.h>
+#include <plat/s3c6410.h>
#include <plat/clock.h>
#include <plat/devs.h>
#include <plat/cpu.h>