From 877e3eb7e9d74ba3059234f76798f12edced06fc Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Fri, 5 Feb 2010 13:52:53 +0100
Subject: [PATCH] --- yaml --- r: 187663 b: refs/heads/master c:
 431fb7df24ebf360ba35895a60d084de364e39f8 h: refs/heads/master i:   187661:
 f3ec27afadde14e2a93a467eda6989c67c8c2f45   187659:
 8f5538529ffcd5fdc29926c193149a70dcb1249a   187655:
 08a75f059ee856cdc95315fc1c40ef53b2d1e244   187647:
 d395912fdf0439ab3523132c61f7b763e241e04d v: v3

---
 [refs]                                                          | 2 +-
 .../include/plat => mach-s3c2410/include/mach}/pm-core.h        | 2 +-
 .../include/plat => mach-s3c64xx/include/mach}/pm-core.h        | 2 +-
 trunk/arch/arm/plat-s3c/pm.c                                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename trunk/arch/arm/{plat-s3c24xx/include/plat => mach-s3c2410/include/mach}/pm-core.h (97%)
 rename trunk/arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/pm-core.h (98%)

diff --git a/[refs] b/[refs]
index 6d7eed0863f2..5d9b80a58542 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89f0ce721c0bc95c109300edcd8525d8ea5df8f2
+refs/heads/master: 431fb7df24ebf360ba35895a60d084de364e39f8
diff --git a/trunk/arch/arm/plat-s3c24xx/include/plat/pm-core.h b/trunk/arch/arm/mach-s3c2410/include/mach/pm-core.h
similarity index 97%
rename from trunk/arch/arm/plat-s3c24xx/include/plat/pm-core.h
rename to trunk/arch/arm/mach-s3c2410/include/mach/pm-core.h
index fb45dd9adca5..70a83b209e25 100644
--- a/trunk/arch/arm/plat-s3c24xx/include/plat/pm-core.h
+++ b/trunk/arch/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/trunk/arch/arm/plat-s3c64xx/include/plat/pm-core.h b/trunk/arch/arm/mach-s3c64xx/include/mach/pm-core.h
similarity index 98%
rename from trunk/arch/arm/plat-s3c64xx/include/plat/pm-core.h
rename to trunk/arch/arm/mach-s3c64xx/include/mach/pm-core.h
index 61b8aae76d3d..1e9f20f0bb7b 100644
--- a/trunk/arch/arm/plat-s3c64xx/include/plat/pm-core.h
+++ b/trunk/arch/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
index e5eef126791b..27cfca597699 100644
--- 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 */