---

yaml --- r: 187663 b: refs/heads/master c: 431fb7d h: refs/heads/master i: 187661: f3ec27a 187659: 8f55385 187655: 08a75f0 187647: d395912 v: v3
git-mirror · Feb 20, 2010 · 877e3eb · 877e3eb
1 parent e0c2bb0
commit 877e3eb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89f0ce721c0bc95c109300edcd8525d8ea5df8f2
+refs/heads/master: 431fb7df24ebf360ba35895a60d084de364e39f8
diff --git a/...h/arm/plat-s3c24xx/include/plat/pm-core.h → ...h/arm/mach-s3c2410/include/mach/pm-core.h b/...h/arm/plat-s3c24xx/include/plat/pm-core.h → ...h/arm/mach-s3c2410/include/mach/pm-core.h
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c24xx/include/plat/pll.h
+/* linux/arch/arm/mach-s3c2410/include/pm-core.h
  *
  * Copyright 2008 Simtec Electronics
  *      Ben Dooks <ben@simtec.co.uk>

diff --git a/...h/arm/plat-s3c64xx/include/plat/pm-core.h → ...h/arm/mach-s3c64xx/include/mach/pm-core.h b/...h/arm/plat-s3c64xx/include/plat/pm-core.h → ...h/arm/mach-s3c64xx/include/mach/pm-core.h
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/pm-core.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/pm-core.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

diff --git a/trunk/arch/arm/plat-s3c/pm.c b/trunk/arch/arm/plat-s3c/pm.c
@@ -29,7 +29,7 @@
 #include <asm/irq.h>
 
 #include <plat/pm.h>
-#include <plat/pm-core.h>
+#include <mach/pm-core.h>
 
 /* for external use */