diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-10-25 13:03:48 +0400 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-10-25 13:03:48 +0400 |
| commit | 8df5a1ba67b1a4b1560472359c30a5b1e3ebcc78 (patch) | |
| tree | 1563cc6270c76867a8dfe60c7c3d1e57064fed79 /drivers/mfd/88pm860x-core.c | |
| parent | 46a99d03f97e54d346a35bb8f0fa79ba73687ad0 (diff) | |
| parent | 6bfd1e63de34a278d67db32e3644340838308252 (diff) | |
| download | linux-8df5a1ba67b1a4b1560472359c30a5b1e3ebcc78.tar.xz | |
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/88pm860x-core.c')
| -rw-r--r-- | drivers/mfd/88pm860x-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c index 7ebe9ef1eba6..c9b1f6422941 100644 --- a/drivers/mfd/88pm860x-core.c +++ b/drivers/mfd/88pm860x-core.c @@ -1247,7 +1247,7 @@ static struct i2c_driver pm860x_driver = { .name = "88PM860x", .owner = THIS_MODULE, .pm = &pm860x_pm_ops, - .of_match_table = of_match_ptr(pm860x_dt_ids), + .of_match_table = pm860x_dt_ids, }, .probe = pm860x_probe, .remove = pm860x_remove, |