diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2013-10-25 11:03:48 +0200 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-10-25 11:03:48 +0200 |
commit | 8df5a1ba67b1a4b1560472359c30a5b1e3ebcc78 (patch) | |
tree | 1563cc6270c76867a8dfe60c7c3d1e57064fed79 /drivers/mfd/max8925-i2c.c | |
parent | 46a99d03f97e54d346a35bb8f0fa79ba73687ad0 (diff) | |
parent | 6bfd1e63de34a278d67db32e3644340838308252 (diff) |
Merge tag 'mfd-lee-3.13-1' of git://git.linaro.org/people/ljones/mfd
mfd-lee-3.13-1
MFD patches due for v3.13.
Diffstat (limited to 'drivers/mfd/max8925-i2c.c')
-rw-r--r-- | drivers/mfd/max8925-i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c index de7fb80a605..176aa26fc78 100644 --- a/drivers/mfd/max8925-i2c.c +++ b/drivers/mfd/max8925-i2c.c @@ -238,7 +238,7 @@ static struct i2c_driver max8925_driver = { .name = "max8925", .owner = THIS_MODULE, .pm = &max8925_pm_ops, - .of_match_table = of_match_ptr(max8925_dt_ids), + .of_match_table = max8925_dt_ids, }, .probe = max8925_probe, .remove = max8925_remove, |