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 /Documentation/arm | |
| parent | 2f3ec501ba1e1a68ab9d413f143bdc8f46417fc1 (diff) | |
| parent | fff94cd9f5527bbba13aa5ea5719d16531ca8e65 (diff) | |
| download | lwn-f5f0e17a8475dee913f362510e6a8ab987d27b9f.tar.gz lwn-f5f0e17a8475dee913f362510e6a8ab987d27b9f.zip | |
Merge branch 'next-s3c-pm' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'Documentation/arm')
| -rw-r--r-- | Documentation/arm/Samsung-S3C24XX/Suspend.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/arm/Samsung-S3C24XX/Suspend.txt b/Documentation/arm/Samsung-S3C24XX/Suspend.txt index 0dab6e32c130..a30fe510572b 100644 --- a/Documentation/arm/Samsung-S3C24XX/Suspend.txt +++ b/Documentation/arm/Samsung-S3C24XX/Suspend.txt @@ -40,13 +40,13 @@ Resuming Machine Support --------------- - The machine specific functions must call the s3c2410_pm_init() function + The machine specific functions must call the s3c_pm_init() function to say that its bootloader is capable of resuming. This can be as simple as adding the following to the machine's definition: - INITMACHINE(s3c2410_pm_init) + INITMACHINE(s3c_pm_init) - A board can do its own setup before calling s3c2410_pm_init, if it + A board can do its own setup before calling s3c_pm_init, if it needs to setup anything else for power management support. There is currently no support for over-riding the default method of @@ -74,7 +74,7 @@ statuc void __init machine_init(void) enable_irq_wake(IRQ_EINT0); - s3c2410_pm_init(); + s3c_pm_init(); } |