Merge branch 'linus' into sched/urgent

[linux-2.6-omap-h63xx.git] / include / linux / regulator / driver.h

diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index bc01b42a8583b7fc9bceca5902f55cbd1c1812d1..e37d80561985df64f9497e0aa26a4718e5c24ab5 100644 (file)
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -51,7 +51,7 @@ struct regulator_ops {
                                          int output_uV, int load_uA);
 
        /* the operations below are for configuration of regulator state when
-        * it's parent PMIC enters a global STANBY/HIBERNATE state */
+        * its parent PMIC enters a global STANDBY/HIBERNATE state */
 
        /* set regulator suspend voltage */
        int (*set_suspend_voltage) (struct regulator_dev *, int uV);