From ce64b8d85de96a1a9538f6dbc960ef592ca05fe8 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Sun, 5 Feb 2012 01:32:02 +0100
Subject: power, max8998: Include linux/module.h just once in
 drivers/power/max8998_charger.c

Remove the duplicate.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
 drivers/power/max8998_charger.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'drivers/power')

diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
index 9b3f2bf56e7..5c5f281ced1 100644
--- a/drivers/power/max8998_charger.c
+++ b/drivers/power/max8998_charger.c
@@ -21,7 +21,6 @@
 
 #include <linux/module.h>
 #include <linux/err.h>
-#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
-- 
cgit v1.2.3


From 202e0116b4700a6d51dc251bd1dbd0a8309806da Mon Sep 17 00:00:00 2001
From: Thomas Weber <weber@corscience.de>
Date: Thu, 16 Feb 2012 08:58:15 +0100
Subject: power: bq27x00: Fix typos in comment

Fix two typos in comments.

Signed-off-by: Thomas Weber <weber@corscience.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
 drivers/power/bq27x00_battery.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'drivers/power')

diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 98bf5676318..cd1545f57f4 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -47,10 +47,10 @@
 #define BQ27x00_REG_TTE			0x16
 #define BQ27x00_REG_TTF			0x18
 #define BQ27x00_REG_TTECP		0x26
-#define BQ27x00_REG_NAC			0x0C /* Nominal available capaciy */
+#define BQ27x00_REG_NAC			0x0C /* Nominal available capacity */
 #define BQ27x00_REG_LMD			0x12 /* Last measured discharge */
 #define BQ27x00_REG_CYCT		0x2A /* Cycle count total */
-#define BQ27x00_REG_AE			0x22 /* Available enery */
+#define BQ27x00_REG_AE			0x22 /* Available energy */
 
 #define BQ27000_REG_RSOC		0x0B /* Relative State-of-Charge */
 #define BQ27000_REG_ILMD		0x76 /* Initial last measured discharge */
-- 
cgit v1.2.3


From 4f3612b16e012ef4801a80de9533e91e2386567c Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 6 Mar 2012 15:13:11 +0100
Subject: Revert "power, max8998: Include linux/module.h just once in
 drivers/power/max8998_charger.c"

This reverts commit ce64b8d85de96a1a9538f6dbc960ef592ca05fe8. It is done
via moduleh tree as part of a larger cleanup.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/power/max8998_charger.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'drivers/power')

diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
index 5c5f281ced1..9b3f2bf56e7 100644
--- a/drivers/power/max8998_charger.c
+++ b/drivers/power/max8998_charger.c
@@ -21,6 +21,7 @@
 
 #include <linux/module.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
-- 
cgit v1.2.3