Merge git://git.infradead.org/users/cbou/battery-3.1

a76ef864 · Linus Torvalds <[email protected]> · 2011-08-23 10:46:56 -07:00

* git://git.infradead.org/users/cbou/battery-3.1:
  s3c-adc-battery: Fix compilation error due to missing header (module.h)
  max8997_charger: Needs module.h
  max8998_charger: Needs module.h

Commit: a76ef86455fd8d199d482acc402675e4dcbe58fe
Parents: f70f9754 · 815efa1e

Merge commit. Changes below are compared with the first parent: f70f9754.

Changes

3 files changed · +3 −0

File	Status	Add	Del	Content
drivers/power/max8997_charger.c	modified	+1	−0	View file
drivers/power/max8998_charger.c	modified	+1	−0	View file
drivers/power/s3c_adc_battery.c	modified	+1	−0	View file

drivers/power/max8997_charger.c

View file

diff --git a/drivers/power/max8997_charger.c b/drivers/power/max8997_charger.c
index 7106b49..ffc5033 100644
--- a/drivers/power/max8997_charger.c
+++ b/drivers/power/max8997_charger.c
@@ -20,6 +20,7 @@
  */
 
 #include <linux/err.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>

drivers/power/max8998_charger.c

View file

diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
index cc21fa2..ef8efad 100644
--- a/drivers/power/max8998_charger.c
+++ b/drivers/power/max8998_charger.c
@@ -20,6 +20,7 @@
  */
 
 #include <linux/err.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>

drivers/power/s3c_adc_battery.c

View file

diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c
index a675e31..d32d0d7 100644
--- a/drivers/power/s3c_adc_battery.c
+++ b/drivers/power/s3c_adc_battery.c
@@ -20,6 +20,7 @@
 #include <linux/s3c_adc_battery.h>
 #include <linux/errno.h>
 #include <linux/init.h>
+#include <linux/module.h>
 
 #include <plat/adc.h>
 