diff --git a/[refs] b/[refs] index aaa927c1becf..4e3ba8a03934 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12234f39a2067887802e799fd45c3c41dd26e187 +refs/heads/master: 1e2d2df32b6902376bc79faf99f264273be056ce diff --git a/trunk/arch/arm/mach-omap2/pm.c b/trunk/arch/arm/mach-omap2/pm.c index 3feb35911a32..fd77cf4fa28c 100644 --- a/trunk/arch/arm/mach-omap2/pm.c +++ b/trunk/arch/arm/mach-omap2/pm.c @@ -163,11 +163,11 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) } /* - * This API is to be called during init to put the various voltage + * This API is to be called during init to set the various voltage * domains to the voltage as per the opp table. Typically we boot up * at the nominal voltage. So this function finds out the rate of * the clock associated with the voltage domain, finds out the correct - * opp entry and puts the voltage domain to the voltage specifies + * opp entry and sets the voltage domain to the voltage specified * in the opp entry */ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, @@ -218,7 +218,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, return 0; exit: - printk(KERN_ERR "%s: Unable to put vdd_%s to its init voltage\n\n", + printk(KERN_ERR "%s: Unable to set vdd_%s to its init voltage\n\n", __func__, vdd_name); return -EINVAL; }