diff options
| author | Linus Torvalds | 2009-06-24 23:35:57 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-06-24 23:35:57 +0200 |
| commit | f27884aeadff9654f4a1e8a05dd92f4b140afe29 (patch) | |
| tree | 22db0c732fcc4e68be25190454631ee1d249e295 /include/linux | |
| parent | Merge branches 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/v... (diff) | |
| parent | da9030_battery: Fix race between event handler and monitor (diff) | |
| download | kernel-qcow2-linux-f27884aeadff9654f4a1e8a05dd92f4b140afe29.tar.gz kernel-qcow2-linux-f27884aeadff9654f4a1e8a05dd92f4b140afe29.tar.xz kernel-qcow2-linux-f27884aeadff9654f4a1e8a05dd92f4b140afe29.zip | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
da9030_battery: Fix race between event handler and monitor
Add MAX17040 Fuel Gauge driver
w1: ds2760_battery: add support for sleep mode feature
w1: ds2760: add support for EEPROM read and write
ds2760_battery: cleanups in ds2760_battery_probe()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/max17040_battery.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/linux/max17040_battery.h b/include/linux/max17040_battery.h new file mode 100644 index 000000000000..ad97b06cf930 --- /dev/null +++ b/include/linux/max17040_battery.h @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2009 Samsung Electronics + * Minkyu Kang <mk7.kang@samsung.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __MAX17040_BATTERY_H_ +#define __MAX17040_BATTERY_H_ + +struct max17040_platform_data { + int (*battery_online)(void); + int (*charger_online)(void); + int (*charger_enable)(void); +}; + +#endif |