diff --git a/[refs] b/[refs] index cb2842214085..7578c02c382d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6995b8cb9622bf574ac6f309e69288e7d0f76ece +refs/heads/master: b10fedf89269a444ddfc92371acc9721749e8b41 diff --git a/trunk/sound/soc/tegra/tegra_wm9712.c b/trunk/sound/soc/tegra/tegra_wm9712.c index cdbd2f0a23bc..68d42403d9b5 100644 --- a/trunk/sound/soc/tegra/tegra_wm9712.c +++ b/trunk/sound/soc/tegra/tegra_wm9712.c @@ -152,7 +152,7 @@ static int tegra_wm9712_driver_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id tegra_wm9712_of_match[] __devinitconst = { +static const struct of_device_id tegra_wm9712_of_match[] = { { .compatible = "nvidia,tegra-audio-wm9712", }, {}, };