diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 21:37:37 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 21:37:37 +0000 |
| commit | 63236f4038f7e14762114606d95769c32cf6cac1 (patch) | |
| tree | 326303a0880c46ddadfc29d3bacad073ed1cef20 /drivers/regulator/tps6524x-regulator.c | |
| parent | 16fbcc3b1139e90fe560fde5619169db74dc02c2 (diff) | |
| parent | ca61a7bfcd1c68eba84a58070540684448216506 (diff) | |
Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next
Diffstat (limited to 'drivers/regulator/tps6524x-regulator.c')
| -rw-r--r-- | drivers/regulator/tps6524x-regulator.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c index 70b7b1f4f000..60846e00c167 100644 --- a/drivers/regulator/tps6524x-regulator.c +++ b/drivers/regulator/tps6524x-regulator.c @@ -108,9 +108,7 @@ #define N_DCDC 3 #define N_LDO 2 #define N_SWITCH 2 -#define N_REGULATORS (3 /* DCDC */ + \ - 2 /* LDO */ + \ - 2 /* switch */) +#define N_REGULATORS (N_DCDC + N_LDO + N_SWITCH) #define FIXED_ILIMSEL BIT(0) #define FIXED_VOLTAGE BIT(1) |