diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-23 10:46:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-23 10:46:56 -0700 |
| commit | a76ef86455fd8d199d482acc402675e4dcbe58fe (patch) | |
| tree | be02d77b7656ba27db3ed87faa5e4a9ee2b921ad | |
| parent | f70f97546800c5dfaf8c580db90df02c824a937a (diff) | |
| parent | 815efa1eab5b0c3e071e5d6df0cc2d7e0c7e6fd7 (diff) | |
| download | linux-a76ef86455fd8d199d482acc402675e4dcbe58fe.tar.bz2 | |
Merge git://git.infradead.org/users/cbou/battery-3.1
* 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
| -rw-r--r-- | drivers/power/max8997_charger.c | 1 | ||||
| -rw-r--r-- | drivers/power/max8998_charger.c | 1 | ||||
| -rw-r--r-- | drivers/power/s3c_adc_battery.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/power/max8997_charger.c b/drivers/power/max8997_charger.c index 7106b49b26e4..ffc5033ea9c9 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> diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c index cc21fa2120be..ef8efadb58cb 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> diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c index a675e31b4f13..d32d0d70f9ba 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> |