Merge branch 's3c-move' into devel

Conflicts: arch/arm/mach-versatile/core.c
2008-10-14 22:24:51 +01:00
parent b6825d2df5 d5120ae72a
commit 7e69a8c4d0
413 changed files with 3568 additions and 2366 deletions
--- a/arch/arm/plat-s3c24xx/common-smdk.c
+++ b/arch/arm/plat-s3c24xx/common-smdk.c
@@ -40,9 +40,9 @@

 #include <asm/plat-s3c/nand.h>

-#include <asm/plat-s3c24xx/common-smdk.h>
-#include <asm/plat-s3c24xx/devs.h>
-#include <asm/plat-s3c24xx/pm.h>
+#include <plat/common-smdk.h>
+#include <plat/devs.h>
+#include <plat/pm.h>

 /* LED devices */