summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:11:38 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:11:38 +0100
commit4e31566d9b73a727b3761c025ec1943c1ff14638 (patch)
tree704e9d3574180b10680a4af4be53487c5aa07a7b /drivers/regulator
parent4c35c8676fb224d0cb328ab83237286f8e2df224 (diff)
parent0a3ee93a3226a951dc32197f6fcfb1b535fbabf4 (diff)
downloadlinux-next-4e31566d9b73a727b3761c025ec1943c1ff14638.tar.gz
Merge remote-tracking branch 'regulator/topic/lp3971' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/lp3971.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c
index 5a4604ee5ea5..947c05ffe0ab 100644
--- a/drivers/regulator/lp3971.c
+++ b/drivers/regulator/lp3971.c
@@ -474,8 +474,8 @@ static int lp3971_i2c_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id lp3971_i2c_id[] = {
- { "lp3971", 0 },
- { }
+ { "lp3971", 0 },
+ { }
};
MODULE_DEVICE_TABLE(i2c, lp3971_i2c_id);