diff options
author | David S. Miller <davem@davemloft.net> | 2013-03-12 10:52:22 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-12 10:52:22 +0100 |
commit | e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf (patch) | |
tree | 3558f68717c70a67e18c3274bb17709a353d036f /drivers/regulator/palmas-regulator.c | |
parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh... (diff) | |
parent | bridge: reserve space for IFLA_BRPORT_FAST_LEAVE (diff) | |
download | linux-e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf.tar.xz linux-e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c
Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/regulator/palmas-regulator.c')
-rw-r--r-- | drivers/regulator/palmas-regulator.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index cde13bb5a8fb..39cf14606784 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -4,6 +4,7 @@ * Copyright 2011-2012 Texas Instruments Inc. * * Author: Graeme Gregory <gg@slimlogic.co.uk> + * Author: Ian Lartey <ian@slimlogic.co.uk> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -156,7 +157,7 @@ static const struct regs_info palmas_regs_info[] = { * * So they are basically (maxV-minV)/stepV */ -#define PALMAS_SMPS_NUM_VOLTAGES 116 +#define PALMAS_SMPS_NUM_VOLTAGES 117 #define PALMAS_SMPS10_NUM_VOLTAGES 2 #define PALMAS_LDO_NUM_VOLTAGES 50 |