Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a76ef864 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f70f9754 815efa1e

drivers/power/max8997_charger.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
 */

 */





#include <linux/err.h>

#include <linux/err.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/power_supply.h>

#include <linux/power_supply.h>

drivers/power/max8998_charger.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
 */

 */





#include <linux/err.h>

#include <linux/err.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/power_supply.h>

#include <linux/power_supply.h>

drivers/power/s3c_adc_battery.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/s3c_adc_battery.h>

#include <linux/s3c_adc_battery.h>

#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/module.h>





#include <plat/adc.h>

#include <plat/adc.h>