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 7e1da41c4a81862952a90741417313d7065bbd94..3eadb4a29a46e828178096dc48b05cccd01527c2 100644 (file)
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -197,12 +197,12 @@ static struct device_attribute power_supply_attrs[] = {
        POWER_SUPPLY_ATTR(scope),
        POWER_SUPPLY_ATTR(charge_term_current),
        POWER_SUPPLY_ATTR(calibrate),
+       /* 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 1de6b7b31dc1baa06a2128b7bf3270b5fdb421b0..d29264c335fb3bf42a990aad2467d95f64892959 100644 (file)
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -148,12 +148,12 @@ enum power_supply_property {
        POWER_SUPPLY_PROP_SCOPE,
        POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT,
        POWER_SUPPLY_PROP_CALIBRATE,
+       /* 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 {