diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-08 17:47:42 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-08 17:47:41 -0800 |
| commit | 4c61075032eb0657b8363c03358e6cd1aed98cdd (patch) | |
| tree | f92f2f6b92ab29444f87edfc224a108c9f1abf73 /include/linux | |
| parent | b6ec54aa3eda19c9f69b529eb981a73cb90e2029 (diff) | |
| parent | e51b33d8089e906e900bab6b5593cb6dae7f4f40 (diff) | |
Merge "leds: leds-qpnp: correct various coding style issues"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regulator/qpnp-regulator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/regulator/qpnp-regulator.h b/include/linux/regulator/qpnp-regulator.h index c7afeb50f244..36288c068ac3 100644 --- a/include/linux/regulator/qpnp-regulator.h +++ b/include/linux/regulator/qpnp-regulator.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2013, 2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -158,8 +158,8 @@ enum qpnp_boost_current_limit { struct qpnp_regulator_platform_data { struct regulator_init_data init_data; int pull_down_enable; - unsigned pin_ctrl_enable; - unsigned pin_ctrl_hpm; + unsigned int pin_ctrl_enable; + unsigned int pin_ctrl_hpm; int system_load; int enable_time; int ocp_enable; |