From 474ecf2b9bf177432be065f73f3c115447325f80 Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas@tweber.de>
Date: Fri, 17 Feb 2012 17:46:21 +0100
Subject: [PATCH] --- yaml --- r: 305083 b: refs/heads/master c:
 91fe4d508f29d71133e9a82ebdc1f2274c514b70 h: refs/heads/master i:   305081:
 392f2c945c18ac27ba743cf98fcb5e2d8fd52ba5   305079:
 364d43057400b0e269855e45356b54d249beb31e v: v3

---
 [refs]                                       |  2 +-
 trunk/Documentation/hwmon/wm831x             |  2 +-
 trunk/drivers/mfd/tps65911-comparator.c      |  2 +-
 trunk/drivers/power/bq27x00_battery.c        |  2 +-
 trunk/drivers/regulator/tps65910-regulator.c | 20 ++++++++++----------
 trunk/include/linux/mfd/wm831x/pdata.h       |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 36fa7bf5f452..541e97e762d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 450c6076a79ebb053cf53e43f948de5ab077c573
+refs/heads/master: 91fe4d508f29d71133e9a82ebdc1f2274c514b70
diff --git a/trunk/Documentation/hwmon/wm831x b/trunk/Documentation/hwmon/wm831x
index 24f47d8f6a42..11446757c8c8 100644
--- a/trunk/Documentation/hwmon/wm831x
+++ b/trunk/Documentation/hwmon/wm831x
@@ -22,7 +22,7 @@ reporting of all the input values but does not provide any alarms.
 Voltage Monitoring
 ------------------
 
-Voltages are sampled by a 12 bit ADC.  Voltages in milivolts are 1.465
+Voltages are sampled by a 12 bit ADC.  Voltages in millivolts are 1.465
 times the ADC value.
 
 Temperature Monitoring
diff --git a/trunk/drivers/mfd/tps65911-comparator.c b/trunk/drivers/mfd/tps65911-comparator.c
index e7ff783aa31e..5a62e6bf89ae 100644
--- a/trunk/drivers/mfd/tps65911-comparator.c
+++ b/trunk/drivers/mfd/tps65911-comparator.c
@@ -26,7 +26,7 @@
 #define COMP1					1
 #define COMP2					2
 
-/* Comparator 1 voltage selection table in milivolts */
+/* Comparator 1 voltage selection table in millivolts */
 static const u16 COMP_VSEL_TABLE[] = {
 	0, 2500, 2500, 2500, 2500, 2550, 2600, 2650,
 	2700, 2750, 2800, 2850, 2900, 2950, 3000, 3050,
diff --git a/trunk/drivers/power/bq27x00_battery.c b/trunk/drivers/power/bq27x00_battery.c
index cd1545f57f49..241848745e29 100644
--- a/trunk/drivers/power/bq27x00_battery.c
+++ b/trunk/drivers/power/bq27x00_battery.c
@@ -456,7 +456,7 @@ static int bq27x00_battery_capacity_level(struct bq27x00_device_info *di,
 }
 
 /*
- * Return the battery Voltage in milivolts
+ * Return the battery Voltage in millivolts
  * Or < 0 if something fails.
  */
 static int bq27x00_battery_voltage(struct bq27x00_device_info *di,
diff --git a/trunk/drivers/regulator/tps65910-regulator.c b/trunk/drivers/regulator/tps65910-regulator.c
index 5c15ba01e9c7..1711dbf28ea5 100644
--- a/trunk/drivers/regulator/tps65910-regulator.c
+++ b/trunk/drivers/regulator/tps65910-regulator.c
@@ -27,54 +27,54 @@
 
 #define TPS65910_SUPPLY_STATE_ENABLED	0x1
 
-/* supported VIO voltages in milivolts */
+/* supported VIO voltages in millivolts */
 static const u16 VIO_VSEL_table[] = {
 	1500, 1800, 2500, 3300,
 };
 
 /* VSEL tables for TPS65910 specific LDOs and dcdc's */
 
-/* supported VDD3 voltages in milivolts */
+/* supported VDD3 voltages in millivolts */
 static const u16 VDD3_VSEL_table[] = {
 	5000,
 };
 
-/* supported VDIG1 voltages in milivolts */
+/* supported VDIG1 voltages in millivolts */
 static const u16 VDIG1_VSEL_table[] = {
 	1200, 1500, 1800, 2700,
 };
 
-/* supported VDIG2 voltages in milivolts */
+/* supported VDIG2 voltages in millivolts */
 static const u16 VDIG2_VSEL_table[] = {
 	1000, 1100, 1200, 1800,
 };
 
-/* supported VPLL voltages in milivolts */
+/* supported VPLL voltages in millivolts */
 static const u16 VPLL_VSEL_table[] = {
 	1000, 1100, 1800, 2500,
 };
 
-/* supported VDAC voltages in milivolts */
+/* supported VDAC voltages in millivolts */
 static const u16 VDAC_VSEL_table[] = {
 	1800, 2600, 2800, 2850,
 };
 
-/* supported VAUX1 voltages in milivolts */
+/* supported VAUX1 voltages in millivolts */
 static const u16 VAUX1_VSEL_table[] = {
 	1800, 2500, 2800, 2850,
 };
 
-/* supported VAUX2 voltages in milivolts */
+/* supported VAUX2 voltages in millivolts */
 static const u16 VAUX2_VSEL_table[] = {
 	1800, 2800, 2900, 3300,
 };
 
-/* supported VAUX33 voltages in milivolts */
+/* supported VAUX33 voltages in millivolts */
 static const u16 VAUX33_VSEL_table[] = {
 	1800, 2000, 2800, 3300,
 };
 
-/* supported VMMC voltages in milivolts */
+/* supported VMMC voltages in millivolts */
 static const u16 VMMC_VSEL_table[] = {
 	1800, 2800, 3000, 3300,
 };
diff --git a/trunk/include/linux/mfd/wm831x/pdata.h b/trunk/include/linux/mfd/wm831x/pdata.h
index 1d7a3f7b3b5d..dcc9631b3052 100644
--- a/trunk/include/linux/mfd/wm831x/pdata.h
+++ b/trunk/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 */
 };