diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-24 19:48:27 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-24 19:48:27 -0500 |
| commit | ffd76d8be36da09f8456c55569c008f5aa93095e (patch) | |
| tree | 4a5e537edcdd3be9197c5fb7af1b4f7e4780ef77 /arch/arm/mach-s5p64x0/pm.c | |
| parent | bfe9c8ae114009491f51452ec727667d516ee79f (diff) | |
| parent | f0e15e2b0c6b3e89daade25a1e9a2d80136c14c3 (diff) | |
Merge branch 'for_3.4/dts_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'arch/arm/mach-s5p64x0/pm.c')
| -rw-r--r-- | arch/arm/mach-s5p64x0/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p64x0/pm.c b/arch/arm/mach-s5p64x0/pm.c index 23f9b22439c9..9cba18bfe47b 100644 --- a/arch/arm/mach-s5p64x0/pm.c +++ b/arch/arm/mach-s5p64x0/pm.c | |||
| @@ -160,7 +160,7 @@ static void s5p64x0_pm_prepare(void) | |||
| 160 | 160 | ||
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | static int s5p64x0_pm_add(struct device *dev) | 163 | static int s5p64x0_pm_add(struct device *dev, struct subsys_interface *sif) |
| 164 | { | 164 | { |
| 165 | pm_cpu_prep = s5p64x0_pm_prepare; | 165 | pm_cpu_prep = s5p64x0_pm_prepare; |
| 166 | pm_cpu_sleep = s5p64x0_cpu_suspend; | 166 | pm_cpu_sleep = s5p64x0_cpu_suspend; |