diff options
author | Benson Leung <bleung@chromium.org> | 2017-12-15 20:54:41 -0800 |
---|---|---|
committer | Benson Leung <bleung@chromium.org> | 2017-12-15 20:54:50 -0800 |
commit | 4398ef0ee62f3eb6d4b2f2acc69e098b3f4c3f81 (patch) | |
tree | d2a6eff73e8b621fd106e5742c48c435e08b5d7f /drivers/mfd/cros_ec.c | |
parent | 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 (diff) | |
parent | 5e0115581bbc367c7958bf5ab8c511b808558533 (diff) |
Merge branch 'ibs-for-chrome-platform-merged' into working-branch-for-4.16
Signed-off-by: Benson Leung <bleung@chromium.org>
Diffstat (limited to 'drivers/mfd/cros_ec.c')
-rw-r--r-- | drivers/mfd/cros_ec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c index b0ca5a4c841e..d61024141e2b 100644 --- a/drivers/mfd/cros_ec.c +++ b/drivers/mfd/cros_ec.c @@ -40,13 +40,13 @@ static struct cros_ec_platform pd_p = { }; static const struct mfd_cell ec_cell = { - .name = "cros-ec-ctl", + .name = "cros-ec-dev", .platform_data = &ec_p, .pdata_size = sizeof(ec_p), }; static const struct mfd_cell ec_pd_cell = { - .name = "cros-ec-ctl", + .name = "cros-ec-dev", .platform_data = &pd_p, .pdata_size = sizeof(pd_p), }; |