diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-30 23:06:46 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-30 23:06:46 (GMT) |
commit | 929d138a3ba776145d2f421c2c4f16d922535090 (patch) | |
tree | cb725266d584eb6a64d4bbc010449bb50ecac247 /arch/arm/mach-exynos/include/mach/pmu.h | |
parent | d64f41d8d2dabf4d10a11f7a5d1ef8706969655f (diff) | |
parent | 67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 (diff) | |
download | linux-fsl-qoriq-929d138a3ba776145d2f421c2c4f16d922535090.tar.xz |
Merge branch 'late/soc' into devel-late
* late/soc:
ARM: vexpress: Remove twice included header files
ARM: vexpress: Device Tree updates
ARM: EXYNOS: Support suspend and resume for EXYNOS5250
ARM: EXYNOS: Add Clock register list for save and restore
ARM: EXYNOS: Add PMU table for EXYNOS5250
ARM: EXYNOS: Rename of function for pm.c
ARM: EXYNOS: Remove GIC save & restore function
ARM: dts: Add node for interrupt combiner controller on EXYNOS5250
ARM: S3C24XX: add support for second irq set of S3C2416
Diffstat (limited to 'arch/arm/mach-exynos/include/mach/pmu.h')
-rw-r--r-- | arch/arm/mach-exynos/include/mach/pmu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/include/mach/pmu.h b/arch/arm/mach-exynos/include/mach/pmu.h index e76b7fa..7c27c2d 100644 --- a/arch/arm/mach-exynos/include/mach/pmu.h +++ b/arch/arm/mach-exynos/include/mach/pmu.h @@ -23,12 +23,12 @@ enum sys_powerdown { }; extern unsigned long l2x0_regs_phys; -struct exynos4_pmu_conf { +struct exynos_pmu_conf { void __iomem *reg; unsigned int val[NUM_SYS_POWERDOWN]; }; -extern void exynos4_sys_powerdown_conf(enum sys_powerdown mode); +extern void exynos_sys_powerdown_conf(enum sys_powerdown mode); extern void s3c_cpu_resume(void); #endif /* __ASM_ARCH_PMU_H */ |