diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-14 12:47:04 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-14 12:47:04 +0400 |
| commit | 7f80850d3f9fd8fda23a317044aef3a6bafab06b (patch) | |
| tree | 4b98a9aa01f1479ab5abfbafcb1a3d9b6e332d34 /arch/arm/mach-shmobile/include/mach/common.h | |
| parent | b93cd6a0c7352b428ba2b8437b44fff6e76d81d2 (diff) | |
| parent | b73b5c493ac001870bd9faf565a61908c82f52d8 (diff) | |
| download | linux-7f80850d3f9fd8fda23a317044aef3a6bafab06b.tar.xz | |
Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh
* 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh:
ARM: mach-shmobile: cpuidle single/global and last_state fixes
ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h
ARM: mach-shmobile: move helper macro PORT_xx to sh_pfc.h
ARM: mach-shmobile: move helper macro PORT_DATA_xx to sh_pfc.h
ARM: mach-shmobile: ap4evb: remove white space from end of line
ARM: mach-shmobile: clock-sh7372: remove un-necessary index
ARM: mach-shmobile: kota2: add comment out separator
ARM: mach-shmobile: sh73a0: add MMC data pin pull-up
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/common.h')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h index c0cdbf997c91..834bd6cd508f 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); |