diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-04-01 12:24:29 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-04-01 12:24:29 -0700 |
| commit | 21295368367beaa563b310d5492166dba158b884 (patch) | |
| tree | c8a7c44beff93c040c76788ce2f6f4916281cbd8 /arch/arm/mach-omap2/prm2xxx.h | |
| parent | 209431eff8afb928d72200c79153165c7d860ca0 (diff) | |
| parent | ca125b5e31f5ada6844f57c5a8e7cd104d26c8fa (diff) | |
Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into omap-for-v4.1/prcm-cleanup
Conflicts:
arch/arm/boot/dts/dra7.dtsi
Diffstat (limited to 'arch/arm/mach-omap2/prm2xxx.h')
| -rw-r--r-- | arch/arm/mach-omap2/prm2xxx.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/prm2xxx.h b/arch/arm/mach-omap2/prm2xxx.h index 1d51643062f7..9008a9e55a1a 100644 --- a/arch/arm/mach-omap2/prm2xxx.h +++ b/arch/arm/mach-omap2/prm2xxx.h @@ -124,9 +124,7 @@ extern int omap2xxx_clkdm_sleep(struct clockdomain *clkdm); extern int omap2xxx_clkdm_wakeup(struct clockdomain *clkdm); -void omap2xxx_prm_clear_mod_irqs(s16 module, u8 regs, u32 wkst_mask); - -extern int __init omap2xxx_prm_init(void); +int __init omap2xxx_prm_init(const struct omap_prcm_init_data *data); #endif |