summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-19 14:34:05 +0200
committerArnd Bergmann <arnd@arndb.de>2013-04-19 16:50:56 +0200
commit0dc488e778069b208d09516c5f0793dc37023c8e (patch)
tree704ad7fa4d8202f1933297e4dd348128a2b9f702 /arch/arm/mach-s3c64xx
parentc4c54da24b8ae12abb2034edaf08021894caf0d0 (diff)
parentbd51de53e1be9896d815bbea30560262216d4616 (diff)
downloadlinux-0dc488e778069b208d09516c5f0793dc37023c8e.tar.bz2
Merge branch 'samsung/exynos-multiplatform' into next/drivers
Merging this into the next/drivers branch avoids a number of pointless conflicts with code changed here. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r--arch/arm/mach-s3c64xx/include/mach/debug-macro.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/debug-macro.S b/arch/arm/mach-s3c64xx/include/mach/debug-macro.S
index c0c076a90f27..dd9ccca5de1f 100644
--- a/arch/arm/mach-s3c64xx/include/mach/debug-macro.S
+++ b/arch/arm/mach-s3c64xx/include/mach/debug-macro.S
@@ -35,4 +35,4 @@
* will be fine with us.
*/
-#include <plat/debug-macro.S>
+#include <debug/samsung.S>