projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/s5m8767...
[linux-2.6-block.git]
/
drivers
/
regulator
/
s2mps11.c
diff --git
a/drivers/regulator/s2mps11.c
b/drivers/regulator/s2mps11.c
index 39fbe6a10c145deafba51fbc6bef6ad08637c6a9..d9e557990577d33029e24e57cb6bf20740ea3ab6 100644
(file)
--- a/
drivers/regulator/s2mps11.c
+++ b/
drivers/regulator/s2mps11.c
@@
-436,7
+436,7
@@
common_reg:
platform_set_drvdata(pdev, s2mps11);
config.dev = &pdev->dev;
- config.regmap = iodev->regmap;
+ config.regmap = iodev->regmap
_pmic
;
config.driver_data = s2mps11;
for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
if (!reg_np) {