diff options
author | Maxime Ripard | 2019-02-19 11:17:05 +0100 |
---|---|---|
committer | Maxime Ripard | 2019-02-19 11:17:05 +0100 |
commit | ae6ba10d5090fc7e9095eaef3dcf06ba016725a6 (patch) | |
tree | e631eaa2df52712783acc4d757841da4890c4143 /drivers/mfd/db8500-prcmu.c | |
parent | drm: Remove set but not used variable 'gem' (diff) | |
parent | Merge v5.0-rc7 into drm-next (diff) | |
download | kernel-qcow2-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.tar.gz kernel-qcow2-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.tar.xz kernel-qcow2-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.zip |
Merge drm/drm-next into drm-misc-next
Backmerge drm-next to bring in -rc7
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'drivers/mfd/db8500-prcmu.c')
-rw-r--r-- | drivers/mfd/db8500-prcmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index 5970b8def548..aec20e1c7d3d 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -2584,7 +2584,7 @@ static struct irq_chip prcmu_irq_chip = { .irq_unmask = prcmu_irq_unmask, }; -static __init char *fw_project_name(u32 project) +static char *fw_project_name(u32 project) { switch (project) { case PRCMU_FW_PROJECT_U8500: @@ -2732,7 +2732,7 @@ void __init db8500_prcmu_early_init(u32 phy_base, u32 size) INIT_WORK(&mb0_transfer.mask_work, prcmu_mask_work); } -static void __init init_prcm_registers(void) +static void init_prcm_registers(void) { u32 val; |