Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / drivers / mmc / host / davinci_mmc.c

diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index d6153740b77fa174060679a4fe3d31d18e619eb9..5d4c5e0fba2f8d43706a909a1e404467c063de68 100644 (file)
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -1192,7 +1192,7 @@ static struct davinci_mmc_config
        struct device_node *np;
        struct davinci_mmc_config *pdata = pdev->dev.platform_data;
        const struct of_device_id *match =
-               of_match_device(of_match_ptr(davinci_mmc_dt_ids), &pdev->dev);
+               of_match_device(davinci_mmc_dt_ids, &pdev->dev);
        u32 data;
 
        np = pdev->dev.of_node;
@@ -1468,7 +1468,7 @@ static struct platform_driver davinci_mmcsd_driver = {
                .name   = "davinci_mmc",
                .owner  = THIS_MODULE,
                .pm     = davinci_mmcsd_pm_ops,
-               .of_match_table = of_match_ptr(davinci_mmc_dt_ids),
+               .of_match_table = davinci_mmc_dt_ids,
        },
        .remove         = __exit_p(davinci_mmcsd_remove),
        .id_table       = davinci_mmc_devtype,