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/mach-s3c2410/mach-qt2410.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/mach-s3c2410/mach-qt2410.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-qt2410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c index 9678a53ceeb1..9f1ba9b63f70 100644 --- a/arch/arm/mach-s3c2410/mach-qt2410.c +++ b/arch/arm/mach-s3c2410/mach-qt2410.c | |||
| @@ -355,7 +355,7 @@ static void __init qt2410_machine_init(void) | |||
| 355 | s3c2410_gpio_cfgpin(S3C2410_GPB5, S3C2410_GPIO_OUTPUT); | 355 | s3c2410_gpio_cfgpin(S3C2410_GPB5, S3C2410_GPIO_OUTPUT); |
| 356 | 356 | ||
| 357 | platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices)); | 357 | platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices)); |
| 358 | s3c2410_pm_init(); | 358 | s3c_pm_init(); |
| 359 | } | 359 | } |
| 360 | 360 | ||
| 361 | MACHINE_START(QT2410, "QT2410") | 361 | MACHINE_START(QT2410, "QT2410") |