diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-02-05 07:52:53 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-20 17:34:03 -0500 |
commit | 431fb7df24ebf360ba35895a60d084de364e39f8 (patch) | |
tree | 0aedc22279524a21f48da577edcbdbbbfe35ef6b | |
parent | 89f0ce721c0bc95c109300edcd8525d8ea5df8f2 (diff) |
ARM: SAMSUNG: Move pm-core.h to machine directory
Move the pm-core.h to the machine include directory in the process of
eliminating the plat-s3c64xx.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/pm-core.h (renamed from arch/arm/plat-s3c24xx/include/plat/pm-core.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/pm-core.h (renamed from arch/arm/plat-s3c64xx/include/plat/pm-core.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c/pm.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-s3c24xx/include/plat/pm-core.h b/arch/arm/mach-s3c2410/include/mach/pm-core.h index fb45dd9adca5..70a83b209e25 100644 --- a/arch/arm/plat-s3c24xx/include/plat/pm-core.h +++ b/arch/arm/mach-s3c2410/include/mach/pm-core.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* linux/arch/arm/plat-s3c24xx/include/plat/pll.h | 1 | /* linux/arch/arm/mach-s3c2410/include/pm-core.h |
2 | * | 2 | * |
3 | * Copyright 2008 Simtec Electronics | 3 | * Copyright 2008 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
diff --git a/arch/arm/plat-s3c64xx/include/plat/pm-core.h b/arch/arm/mach-s3c64xx/include/mach/pm-core.h index 61b8aae76d3d..1e9f20f0bb7b 100644 --- a/arch/arm/plat-s3c64xx/include/plat/pm-core.h +++ b/arch/arm/mach-s3c64xx/include/mach/pm-core.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* linux/arch/arm/plat-s3c64xx/include/plat/pm-core.h | 1 | /* linux/arch/arm/mach-s3c64xx/include/mach/pm-core.h |
2 | * | 2 | * |
3 | * Copyright 2008 Openmoko, Inc. | 3 | * Copyright 2008 Openmoko, Inc. |
4 | * Copyright 2008 Simtec Electronics | 4 | * Copyright 2008 Simtec Electronics |
diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-s3c/pm.c index e5eef126791b..27cfca597699 100644 --- a/arch/arm/plat-s3c/pm.c +++ b/arch/arm/plat-s3c/pm.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
30 | 30 | ||
31 | #include <plat/pm.h> | 31 | #include <plat/pm.h> |
32 | #include <plat/pm-core.h> | 32 | #include <mach/pm-core.h> |
33 | 33 | ||
34 | /* for external use */ | 34 | /* for external use */ |
35 | 35 | ||