diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 17:03:23 +0200 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 17:03:23 +0200 |
commit | 25fbe5ca4d0f37170451b682bd150a70f944aca0 (patch) | |
tree | c23f80847119d9f297206a37af2ad548ccdde802 /arch/arm/mach-shmobile/include/mach/common.h | |
parent | ff67a6b9aaddb2dea6ed4a3f7df8a0c6acf131c2 (diff) | |
download | kernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.zip kernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.tar.gz kernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.tar.bz2 |
update other arm platforms from 3.2.72 and also merge some general arm code (boot)
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/common.h')
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/common.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h index 06aecb3..834bd6c 100644 --- a/arch/arm/mach-shmobile/include/mach/common.h +++ b/arch/arm/mach-shmobile/include/mach/common.h @@ -9,9 +9,9 @@ extern int clk_init(void); extern void shmobile_handle_irq_intc(struct pt_regs *); extern void shmobile_handle_irq_gic(struct pt_regs *); extern struct platform_suspend_ops shmobile_suspend_ops; -struct cpuidle_device; +struct cpuidle_driver; extern void (*shmobile_cpuidle_modes[])(void); -extern void (*shmobile_cpuidle_setup)(struct cpuidle_device *dev); +extern void (*shmobile_cpuidle_setup)(struct cpuidle_driver *drv); extern void sh7367_init_irq(void); extern void sh7367_add_early_devices(void); @@ -35,8 +35,8 @@ extern void sh7372_add_standard_devices(void); extern void sh7372_clock_init(void); extern void sh7372_pinmux_init(void); extern void sh7372_pm_init(void); -extern void sh7372_cpu_suspend(void); -extern void sh7372_cpu_resume(void); +extern void sh7372_resume_core_standby_a3sm(void); +extern int sh7372_do_idle_a3sm(unsigned long unused); extern struct clk sh7372_extal1_clk; extern struct clk sh7372_extal2_clk; |