aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-12-11 19:24:18 -0500
committerBen Dooks <ben-linux@fluff.org>2009-03-08 08:35:47 -0400
commit4e59c25dcbc1f033d043f1009a7f6aaa1f2aef26 (patch)
treea6e55b669fede04e64c17a6086919cd4aa59553a /arch/arm/plat-s3c
parent598ee00207a561572e011c49e39144a321ef3979 (diff)
[ARM] S3C: Rename s3c2410_pm_init to s3c_pm_init.
Since we have moved a large proportion of the PM code to the common support area, remove the cpu specific name from the initialisation function. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c')
-rw-r--r--arch/arm/plat-s3c/include/plat/pm.h6
-rw-r--r--arch/arm/plat-s3c/pm.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/plat-s3c/include/plat/pm.h b/arch/arm/plat-s3c/include/plat/pm.h
index 5e27de955da0..a6104c8055ff 100644
--- a/arch/arm/plat-s3c/include/plat/pm.h
+++ b/arch/arm/plat-s3c/include/plat/pm.h
@@ -9,7 +9,7 @@
9 * published by the Free Software Foundation. 9 * published by the Free Software Foundation.
10*/ 10*/
11 11
12/* s3c2410_pm_init 12/* s3c_pm_init
13 * 13 *
14 * called from board at initialisation time to setup the power 14 * called from board at initialisation time to setup the power
15 * management 15 * management
@@ -17,11 +17,11 @@
17 17
18#ifdef CONFIG_PM 18#ifdef CONFIG_PM
19 19
20extern __init int s3c2410_pm_init(void); 20extern __init int s3c_pm_init(void);
21 21
22#else 22#else
23 23
24static inline int s3c2410_pm_init(void) 24static inline int s3c_pm_init(void)
25{ 25{
26 return 0; 26 return 0;
27} 27}
diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-s3c/pm.c
index 7c736deff8ae..e82ec628ced1 100644
--- a/arch/arm/plat-s3c/pm.c
+++ b/arch/arm/plat-s3c/pm.c
@@ -316,14 +316,14 @@ static struct platform_suspend_ops s3c_pm_ops = {
316 .valid = suspend_valid_only_mem, 316 .valid = suspend_valid_only_mem,
317}; 317};
318 318
319/* s3c2410_pm_init 319/* s3c_pm_init
320 * 320 *
321 * Attach the power management functions. This should be called 321 * Attach the power management functions. This should be called
322 * from the board specific initialisation if the board supports 322 * from the board specific initialisation if the board supports
323 * it. 323 * it.
324*/ 324*/
325 325
326int __init s3c2410_pm_init(void) 326int __init s3c_pm_init(void)
327{ 327{
328 printk("S3C Power Management, Copyright 2004 Simtec Electronics\n"); 328 printk("S3C Power Management, Copyright 2004 Simtec Electronics\n");
329 329