summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/wakeup-mask.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-01-16 22:28:56 -0800
committerOlof Johansson <olof@lixom.net>2017-01-16 22:28:56 -0800
commitd2d08aba624899d159fbe5b0ed3a6915232e42c7 (patch)
treece675ca17c56bf1d938f0c134f91a7d252be4846 /arch/arm/plat-samsung/wakeup-mask.c
parentddcb0a762b61e374cc9d0269da0d9abc44489bb4 (diff)
parentcda1a52dab50340728e46601e6c9da9fc4beaf1f (diff)
downloadblackbird-op-linux-d2d08aba624899d159fbe5b0ed3a6915232e42c7.tar.gz
blackbird-op-linux-d2d08aba624899d159fbe5b0ed3a6915232e42c7.zip
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/plat-samsung/wakeup-mask.c')
-rw-r--r--arch/arm/plat-samsung/wakeup-mask.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/wakeup-mask.c b/arch/arm/plat-samsung/wakeup-mask.c
index 20c3d9117cc2..b9de6b543330 100644
--- a/arch/arm/plat-samsung/wakeup-mask.c
+++ b/arch/arm/plat-samsung/wakeup-mask.c
@@ -20,7 +20,7 @@
#include <plat/pm.h>
void samsung_sync_wakemask(void __iomem *reg,
- struct samsung_wakeup_mask *mask, int nr_mask)
+ const struct samsung_wakeup_mask *mask, int nr_mask)
{
struct irq_data *data;
u32 val;
OpenPOWER on IntegriCloud