From: Todd Poynor <toddpoynor@google.com>
Date: Fri, 13 Jul 2012 03:27:16 +0000 (-0700)
Subject: power: power_supply: move POWER_SUPPLY_PROP_USB_HC to type 'int' order
X-Git-Tag: firefly_0821_release~4090^2~712
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=53254b7faea89f3c4e8f1d787ef7f04858f64452;p=firefly-linux-kernel-4.4.55.git

power: power_supply: move POWER_SUPPLY_PROP_USB_HC to type 'int' order

Change-Id: I001af30ab5fe06dde5f368241f21b9e0864777a1
Signed-off-by: Todd Poynor <toddpoynor@google.com>
---

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index ccbb28049b80..3900e3414926 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -189,12 +189,12 @@ static struct device_attribute power_supply_attrs[] = {
 	POWER_SUPPLY_ATTR(time_to_full_avg),
 	POWER_SUPPLY_ATTR(type),
 	POWER_SUPPLY_ATTR(scope),
+	/* Local extensions */
+	POWER_SUPPLY_ATTR(usb_hc),
 	/* Properties of type `const char *' */
 	POWER_SUPPLY_ATTR(model_name),
 	POWER_SUPPLY_ATTR(manufacturer),
 	POWER_SUPPLY_ATTR(serial_number),
-	/* Local extensions */
-	POWER_SUPPLY_ATTR(usb_hc),
 };
 
 static struct attribute *
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 1b82404da86d..d121a679142f 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -140,12 +140,12 @@ enum power_supply_property {
 	POWER_SUPPLY_PROP_TIME_TO_FULL_AVG,
 	POWER_SUPPLY_PROP_TYPE, /* use power_supply.type instead */
 	POWER_SUPPLY_PROP_SCOPE,
+	/* Local extensions */
+	POWER_SUPPLY_PROP_USB_HC,
 	/* Properties of type `const char *' */
 	POWER_SUPPLY_PROP_MODEL_NAME,
 	POWER_SUPPLY_PROP_MANUFACTURER,
 	POWER_SUPPLY_PROP_SERIAL_NUMBER,
-	/* Local extensions */
-	POWER_SUPPLY_PROP_USB_HC,
 };
 
 enum power_supply_type {