Merge branch 'next' into for-linus

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
index 1d7a3f7b3b5d..dcc9631b3052 100644
--- a/include/linux/mfd/wm831x/pdata.h
+++ b/include/linux/mfd/wm831x/pdata.h
@@ -26,7 +26,7 @@ struct wm831x_backlight_pdata {
 struct wm831x_backup_pdata {
         int charger_enable;
         int no_constant_voltage;  /** Disable constant voltage charging */
-        int vlim;   /** Voltage limit in milivolts */
+        int vlim;   /** Voltage limit in millivolts */
         int ilim;   /** Current limit in microamps */
 };