diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-17 09:28:56 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-17 09:28:56 +0300 |
| commit | d2d08aba624899d159fbe5b0ed3a6915232e42c7 (patch) | |
| tree | ce675ca17c56bf1d938f0c134f91a7d252be4846 /arch/arm/mach-s3c24xx/pm-s3c2412.c | |
| parent | ddcb0a762b61e374cc9d0269da0d9abc44489bb4 (diff) | |
| parent | cda1a52dab50340728e46601e6c9da9fc4beaf1f (diff) | |
| download | linux-d2d08aba624899d159fbe5b0ed3a6915232e42c7.tar.xz | |
Merge tag 'samsung-soc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc
Samsung mach/soc update for v4.11. Mostly cleanups:
1. Removal of unused platform data in S3C24XX and S3C64xx as follow up of
conversion to new DMA channel request API.
2. Adding const and __ro_after_init to various data in Samsung platforms.
* tag 'samsung-soc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: s3c64xx: Constify wake_irqs
ARM: s3c24xx: Constify wake_irqs
ARM: SAMSUNG: Constify array of wake irqs passed to samsung_sync_wakemask
ARM: s3c64xx: Annotate external clock frequencies __ro_after_init
ARM: s3c24xx: Constify few integer tables
ARM: EXYNOS: Annotate iomem and pm_data pointers __ro_after_init
ARM: EXYNOS: Constify list of retention registers
ARM: s3c24xx: Drop unused struct s3c_audio_pdata entries
ARM: s3c64xx: Drop initialization of unused struct s3c_audio_pdata fields
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-s3c24xx/pm-s3c2412.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/pm-s3c2412.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/pm-s3c2412.c b/arch/arm/mach-s3c24xx/pm-s3c2412.c index d75f95e487ee..0ae4d47a4663 100644 --- a/arch/arm/mach-s3c24xx/pm-s3c2412.c +++ b/arch/arm/mach-s3c24xx/pm-s3c2412.c @@ -53,7 +53,7 @@ static int s3c2412_cpu_suspend(unsigned long arg) } /* mapping of interrupts to parts of the wakeup mask */ -static struct samsung_wakeup_mask wake_irqs[] = { +static const struct samsung_wakeup_mask wake_irqs[] = { { .irq = IRQ_RTC, .bit = S3C2412_PWRCFG_RTC_MASKIRQ, }, }; |