diff options
author | Mark Brown <broonie@kernel.org> | 2019-03-04 18:32:43 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-03-04 18:32:43 +0300 |
commit | 88f268a5bcc3b0683e6fbaf9973702e5329fc1e3 (patch) | |
tree | a64bf49e575ece017359ba5ac89fbc52efd81f2a /drivers/regulator/hi655x-regulator.c | |
parent | c364098fe8745b08a491fb43de785806ca91ba5e (diff) | |
parent | e5680c4de3eb3ea5538d11733a91ccef19badd69 (diff) | |
download | linux-88f268a5bcc3b0683e6fbaf9973702e5329fc1e3.tar.xz |
Merge branch 'regulator-5.1' into regulator-next
Diffstat (limited to 'drivers/regulator/hi655x-regulator.c')
-rw-r--r-- | drivers/regulator/hi655x-regulator.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/regulator/hi655x-regulator.c b/drivers/regulator/hi655x-regulator.c index 36ae54b53814..bba24a6fdb1e 100644 --- a/drivers/regulator/hi655x-regulator.c +++ b/drivers/regulator/hi655x-regulator.c @@ -28,7 +28,6 @@ struct hi655x_regulator { unsigned int disable_reg; unsigned int status_reg; - unsigned int ctrl_regs; unsigned int ctrl_mask; struct regulator_desc rdesc; }; |