diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-26 22:44:43 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-26 22:44:43 +0000 |
| commit | f5f0e17a8475dee913f362510e6a8ab987d27b9f (patch) | |
| tree | ebe44e7774400730f6c15cd5a84187113c274e3d /arch/arm/plat-s3c24xx/common-smdk.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/common-smdk.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/common-smdk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c index 3d4837021ac..1a8347cec20 100644 --- a/arch/arm/plat-s3c24xx/common-smdk.c +++ b/arch/arm/plat-s3c24xx/common-smdk.c @@ -201,5 +201,5 @@ void __init smdk_machine_init(void) platform_add_devices(smdk_devs, ARRAY_SIZE(smdk_devs)); - s3c2410_pm_init(); + s3c_pm_init(); } |