Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 256937
b: refs/heads/master
c: 999a4d2
h: refs/heads/master
i:
  256935: 65d33f4
v: v3
  • Loading branch information
Magnus Damm authored and Rafael J. Wysocki committed Jul 10, 2011
1 parent fd7433c commit 0f65ec4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d24771dec9c62945a5d1c6a37e7a04f5c2a2ae6f
refs/heads/master: 999a4d2a4da0527567e4b17d4da0782509358a83
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-shmobile/include/mach/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ extern struct platform_suspend_ops shmobile_suspend_ops;
struct cpuidle_device;
extern void (*shmobile_cpuidle_modes[])(void);
extern void (*shmobile_cpuidle_setup)(struct cpuidle_device *dev);
extern void (*shmobile_runtime_pm_late_init)(void);

extern void sh7367_init_irq(void);
extern void sh7367_add_early_devices(void);
Expand Down
10 changes: 10 additions & 0 deletions trunk/arch/arm/mach-shmobile/pm_runtime.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,13 @@ static int __init sh_pm_runtime_init(void)
return 0;
}
core_initcall(sh_pm_runtime_init);

void (*shmobile_runtime_pm_late_init)(void);

static int __init sh_pm_runtime_late_init(void)
{
if (shmobile_runtime_pm_late_init)
shmobile_runtime_pm_late_init();
return 0;
}
late_initcall(sh_pm_runtime_late_init);

0 comments on commit 0f65ec4

Please sign in to comment.