Merge remote-tracking branch 'regulator/topic/ramp' into regulator-next

[firefly-linux-kernel-4.4.55.git] / include / linux / power_supply.h

diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 3828cefb4f65876e635e5533d24233d32ab6590b..804b90643a85eae1b42f46f6870b5be3f23b36c2 100644 (file)
--- 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,