aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-12-21 17:21:07 +0100
committerLars-Peter Clausen <lars@metafoo.de>2009-12-21 17:21:07 +0100
commit2cc59440a693edb5beb1195c109ecd101f47c7d6 (patch)
tree9f2b9dddce8ba40996453f9865b84a93ca2d98c2 /include
parent270f524f6162b047846c6756a4a67ab902ecef46 (diff)
parent80b69fcb9233a7643a3d1456c11edcae078a2e17 (diff)
Merge branch 'platform_battery-2.6.32' into om-gta02-2.6.32
Conflicts: drivers/power/Kconfig drivers/power/Makefile
Diffstat (limited to 'include')
-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