Merge branches 'acpi-button', 'acpica' and 'acpi-sysfs'

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / cm_common.c

diff --git a/arch/arm/mach-omap2/cm_common.c b/arch/arm/mach-omap2/cm_common.c
index 23e8bcec34e33c89d7f9f196badb57136db57378..bbe41f4c9dc8ca58fb5d8fbb8e15126e5ecfb9a0 100644 (file)
--- a/arch/arm/mach-omap2/cm_common.c
+++ b/arch/arm/mach-omap2/cm_common.c
@@ -65,7 +65,7 @@ void __init omap2_set_globals_cm(void __iomem *cm, void __iomem *cm2)
  * or 0 upon success.  XXX This function is only needed until absolute
  * register addresses are removed from the OMAP struct clk records.
  */
-int cm_split_idlest_reg(void __iomem *idlest_reg, s16 *prcm_inst,
+int cm_split_idlest_reg(struct clk_omap_reg *idlest_reg, s16 *prcm_inst,
                        u8 *idlest_reg_id)
 {
        if (!cm_ll_data->split_idlest_reg) {