diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-26 18:44:43 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-26 18:44:43 -0400 |
| commit | f5f0e17a8475dee913f362510e6a8ab987d27b9f (patch) | |
| tree | ebe44e7774400730f6c15cd5a84187113c274e3d /arch/arm/plat-s3c24xx/pm-simtec.c | |
| parent | 2f3ec501ba1e1a68ab9d413f143bdc8f46417fc1 (diff) | |
| parent | fff94cd9f5527bbba13aa5ea5719d16531ca8e65 (diff) | |
Merge branch 'next-s3c-pm' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/plat-s3c24xx/pm-simtec.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/pm-simtec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/pm-simtec.c b/arch/arm/plat-s3c24xx/pm-simtec.c index 21dfa74773d1..da0d3217d3e3 100644 --- a/arch/arm/plat-s3c24xx/pm-simtec.c +++ b/arch/arm/plat-s3c24xx/pm-simtec.c | |||
| @@ -61,7 +61,7 @@ static __init int pm_simtec_init(void) | |||
| 61 | 61 | ||
| 62 | __raw_writel(gstatus4, S3C2410_GSTATUS4); | 62 | __raw_writel(gstatus4, S3C2410_GSTATUS4); |
| 63 | 63 | ||
| 64 | return s3c2410_pm_init(); | 64 | return s3c_pm_init(); |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | arch_initcall(pm_simtec_init); | 67 | arch_initcall(pm_simtec_init); |