]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
power_supply: Move of_node out of the #ifdef CONFIG_OF
authorAnton Vorontsov <anton@enomsg.org>
Sat, 29 Jun 2013 01:17:22 +0000 (18:17 -0700)
committerAnton Vorontsov <anton@enomsg.org>
Sat, 29 Jun 2013 01:20:52 +0000 (18:20 -0700)
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>
include/linux/power_supply.h

index 3828cefb4f65876e635e5533d24233d32ab6590b..804b90643a85eae1b42f46f6870b5be3f23b36c2 100644 (file)
@@ -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,