diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-22 14:02:34 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-22 14:02:34 -0800 |
| commit | bb748890d13232dba4a3975368bfeea6896368ae (patch) | |
| tree | aac4a418ff9f990b374655576511bd5a38664b0c /arch/arm/plat-samsung/include/plat/pm.h | |
| parent | 650286d25729b34402ee2545f2c0113d8a142427 (diff) | |
| parent | 7c394e7be4d267c02eaaac8fa197a7c1b023c99b (diff) | |
| download | blackbird-op-linux-bb748890d13232dba4a3975368bfeea6896368ae.tar.gz blackbird-op-linux-bb748890d13232dba4a3975368bfeea6896368ae.zip | |
Merge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
From Kukjin Kim:
Samsung cleanup for v3.14
- remove unused SAMSUNG_GPIOLIB_4BIT and IRQF_DISABLED
- constify immutable PMU data table and PM clksrc register
- make const struct for sleep_save
* tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Constify clksrc immutable register restore tables
ARM: SAMSUNG: Let s3c_pm_do_restore_*() take const sleep_save
ARM: EXYNOS: Constify data tables for pmu
ARM: SAMSUNG: remove IRQF_DISABLED
ARM: SAMSUNG: remove unused SAMSUNG_GPIOLIB_4BIT Kconfig parameter
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/pm.h')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/pm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h index 6bc1a8f471e3..ff6063f0d5ea 100644 --- a/arch/arm/plat-samsung/include/plat/pm.h +++ b/arch/arm/plat-samsung/include/plat/pm.h @@ -101,8 +101,8 @@ struct pm_uart_save { /* helper functions to save/restore lists of registers. */ extern void s3c_pm_do_save(struct sleep_save *ptr, int count); -extern void s3c_pm_do_restore(struct sleep_save *ptr, int count); -extern void s3c_pm_do_restore_core(struct sleep_save *ptr, int count); +extern void s3c_pm_do_restore(const struct sleep_save *ptr, int count); +extern void s3c_pm_do_restore_core(const struct sleep_save *ptr, int count); #ifdef CONFIG_SAMSUNG_PM extern int s3c_irq_wake(struct irq_data *data, unsigned int state); |
