Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent

1 files changed, 5 insertions, 1 deletions

diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 30083a896f36..7d7325685c42 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -89,6 +89,7 @@ enum power_supply_property {
         POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
         POWER_SUPPLY_PROP_VOLTAGE_NOW,
         POWER_SUPPLY_PROP_VOLTAGE_AVG,
+        POWER_SUPPLY_PROP_CURRENT_MAX,
         POWER_SUPPLY_PROP_CURRENT_NOW,
         POWER_SUPPLY_PROP_CURRENT_AVG,
         POWER_SUPPLY_PROP_POWER_NOW,
@@ -125,7 +126,10 @@ enum power_supply_type {
         POWER_SUPPLY_TYPE_BATTERY = 0,
         POWER_SUPPLY_TYPE_UPS,
         POWER_SUPPLY_TYPE_MAINS,
-        POWER_SUPPLY_TYPE_USB,
+        POWER_SUPPLY_TYPE_USB,          /* Standard Downstream Port */
+        POWER_SUPPLY_TYPE_USB_DCP,      /* Dedicated Charging Port */
+        POWER_SUPPLY_TYPE_USB_CDP,      /* Charging Downstream Port */
+        POWER_SUPPLY_TYPE_USB_ACA,      /* Accessory Charger Adapters */
 };
 
 union power_supply_propval {