aboutsummaryrefslogtreecommitdiff
path: root/include/linux/platform_battery.h
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-05-18 01:04:36 +0200
committerLars-Peter Clausen <lars@metafoo.de>2010-05-18 01:04:36 +0200
commite23313fc76e2724fe56354526275458a0bdc10c3 (patch)
tree49129c2092670f43a31c1f7ecc16d37ca9bc3ad4 /include/linux/platform_battery.h
parentcd3258c9d166f8c64a85b0cd2c0cd64342d69eb8 (diff)
parent34e2f560d56dfdc069a8d4dab319e078806169b9 (diff)
Merge branch 'platform_battery-2.6.34' into om-gta02-2.6.34
Conflicts: drivers/power/Kconfig drivers/power/Makefile
Diffstat (limited to 'include/linux/platform_battery.h')
-rw-r--r--include/linux/platform_battery.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/platform_battery.h b/include/linux/platform_battery.h
new file mode 100644
index 00000000000..00f7651096a
--- /dev/null
+++ b/include/linux/platform_battery.h
@@ -0,0 +1,12 @@
+#ifndef __PLATFORM_BATTERY_H__
+#define __PLATFORM_BATTERY_H__
+
+struct platform_bat_platform_data {
+ const char *name;
+ int (**get_property)(void);
+ int (*is_present)(void);
+ enum power_supply_property *properties;
+ size_t num_properties;
+};
+
+#endif