projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mfd
/
twl-core.c
diff --git
a/drivers/mfd/twl-core.c
b/drivers/mfd/twl-core.c
index 271d98a83caf468e1a223fa4bab968c2815e297b..11b76c0109f55c451bd3e52fb966d62099b136e1 100644
(file)
--- a/
drivers/mfd/twl-core.c
+++ b/
drivers/mfd/twl-core.c
@@
-671,7
+671,7
@@
add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
}
if (IS_ENABLED(CONFIG_PWM_TWL6030) && twl_class_is_6030()) {
- child = add_child(
TWL6030_MODULE
_ID1, "twl6030-pwm", NULL, 0,
+ child = add_child(
SUB_CHIP
_ID1, "twl6030-pwm", NULL, 0,
false, 0, 0);
if (IS_ERR(child))
return PTR_ERR(child);