summaryrefslogtreecommitdiff
path: root/include/linux/power_supply.h
diff options
context:
space:
mode:
authorAnton Vorontsov <anton@enomsg.org>2013-06-28 18:17:22 -0700
committerAnton Vorontsov <anton@enomsg.org>2013-06-28 18:20:52 -0700
commitb50df95c8f0703c95625181d2eaf53855c5ebee5 (patch)
tree4f5ef75f0c81c8fa0c9435dd04d7f9cb8fe2bb6b /include/linux/power_supply.h
parentb52eafcd79728d61cfc75b64c817b5037a31dfe7 (diff)
power_supply: Move of_node out of the #ifdef CONFIG_OF
Similar to linux/device.h, move of_node struct member out of the #ifdef CONFIG_OF so that the drivers won't have to mess with #ifdefs in .c files. Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'include/linux/power_supply.h')
-rw-r--r--include/linux/power_supply.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 3828cefb4f65..804b90643a85 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -162,6 +162,8 @@ union power_supply_propval {
const char *strval;
};
+struct device_node;
+
struct power_supply {
const char *name;
enum power_supply_type type;
@@ -173,9 +175,7 @@ struct power_supply {
char **supplied_from;
size_t num_supplies;
-#ifdef CONFIG_OF
struct device_node *of_node;
-#endif
int (*get_property)(struct power_supply *psy,
enum power_supply_property psp,