summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx/mach-smartq7.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-11-07 12:27:23 -0800
committerTony Lindgren <tony@atomide.com>2011-11-07 12:27:23 -0800
commitd30cc16c8e48368e0518f4975a78711e53e14a0f (patch)
tree26b57f7ab5a963cc3d6c57dff6951bd930875583 /arch/arm/mach-s3c64xx/mach-smartq7.c
parent41eb2d813f558900884e240c2f723e36c7bd151f (diff)
parenta1bcc1dcef8451b4291ea2a1b2677cb194102952 (diff)
downloadop-kernel-dev-d30cc16c8e48368e0518f4975a78711e53e14a0f.zip
op-kernel-dev-d30cc16c8e48368e0518f4975a78711e53e14a0f.tar.gz
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smartq7.c')
-rw-r--r--arch/arm/mach-s3c64xx/mach-smartq7.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c
index 04f914b..f112547 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq7.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq7.c
@@ -22,8 +22,8 @@
#include <mach/map.h>
#include <mach/regs-gpio.h>
-#include <mach/s3c6410.h>
+#include <plat/s3c6410.h>
#include <plat/cpu.h>
#include <plat/devs.h>
#include <plat/fb.h>
OpenPOWER on IntegriCloud