diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:18 +0100 |
| commit | 684d8c515c1123f34363bccc96d4148bdd58c5ed (patch) | |
| tree | 9cde9cea8250bcb6bd183817219e1150f48fb67b /sound/soc/davinci/davinci-mcasp.c | |
| parent | 9805fe391d918d5127530ca7741904407d28f428 (diff) | |
| parent | 4867e99d2165416f8b1093c3267b5f5ac5ebf8ef (diff) | |
| download | linux-684d8c515c1123f34363bccc96d4148bdd58c5ed.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Diffstat (limited to 'sound/soc/davinci/davinci-mcasp.c')
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 81490febac6d..32ddb7fe5034 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -1024,7 +1024,7 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of( struct device_node *np = pdev->dev.of_node; struct snd_platform_data *pdata = NULL; const struct of_device_id *match = - of_match_device(of_match_ptr(mcasp_dt_ids), &pdev->dev); + of_match_device(mcasp_dt_ids, &pdev->dev); const u32 *of_serial_dir32; u8 *of_serial_dir; @@ -1257,7 +1257,7 @@ static struct platform_driver davinci_mcasp_driver = { .driver = { .name = "davinci-mcasp", .owner = THIS_MODULE, - .of_match_table = of_match_ptr(mcasp_dt_ids), + .of_match_table = mcasp_dt_ids, }, }; |