summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/control.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2014-07-15 07:00:00 -0700
committerTony Lindgren <tony@atomide.com>2014-07-15 07:00:00 -0700
commit81c6d80661e07d1ecd6c6ac6b7136edac5209bab (patch)
tree96ac9f06fe73f0da16c0139c047135caf5b3907d /arch/arm/mach-omap2/control.h
parent6bf58859591371b247131e1cba53f18ffecdce06 (diff)
parentba12c24286296159a1271eb19f2fc5c2ef59fbde (diff)
Merge branch 'for-v3.17/cm-prm-cleanup' of https://github.com/t-kristo/linux-pm into omap-for-v3.17/soc
Diffstat (limited to 'arch/arm/mach-omap2/control.h')
-rw-r--r--arch/arm/mach-omap2/control.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h
index 5dc2310c281..a3c013345c4 100644
--- a/arch/arm/mach-omap2/control.h
+++ b/arch/arm/mach-omap2/control.h
@@ -455,7 +455,7 @@ extern void omap_ctrl_write_dsp_boot_addr(u32 bootaddr);
extern void omap_ctrl_write_dsp_boot_mode(u8 bootmode);
extern void omap3630_ctrl_disable_rta(void);
extern int omap3_ctrl_save_padconf(void);
-extern void omap3_ctrl_set_iva_bootmode_idle(void);
+void omap3_ctrl_init(void);
extern void omap2_set_globals_control(void __iomem *ctrl,
void __iomem *ctrl_pad);
#else