Skip to content

Commit

Permalink
Merge git://git.infradead.org/users/cbou/battery-3.1
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Linus Torvalds committed Aug 23, 2011
2 parents f70f975 + 815efa1 commit a76ef86
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions drivers/power/max8997_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions drivers/power/max8998_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions drivers/power/s3c_adc_battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit a76ef86

Please sign in to comment.