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 ccbb28049b80b2e6767dd56826cfb8770d210234..3900e34149262b423a977a93c1e94ea451a2930d 100644 (file)
--- 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 1b82404da86dea6055f437ed32a937b0208492c3..d121a679142f6b8ba30e637f54aebe1caa8c774a 100644 (file)
--- 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 {