---

yaml --- r: 371839 b: refs/heads/master c: e580f1c h: refs/heads/master i: 371837: 3f75863 371835: 91c2e95 371831: 5b1f8df 371823: 72e2c91 371807: 7fabd70 371775: a5f5b51 371711: b6d643f v: v3
git-mirror · Mar 26, 2013 · b3f6dc3 · b3f6dc3
1 parent 77cad2f
commit b3f6dc3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ba7f849eceed0564928f83aa8ec51906e69336d
+refs/heads/master: e580f1ced92e0911cce71c3cae7c6e82159c82b4
diff --git a/trunk/sound/soc/pxa/pxa-ssp.c b/trunk/sound/soc/pxa/pxa-ssp.c
@@ -794,14 +794,19 @@ static struct snd_soc_dai_driver pxa_ssp_dai = {
 		.ops = &pxa_ssp_dai_ops,
 };
 
+static const struct snd_soc_component_driver pxa_ssp_component = {
+	.name		= "pxa-ssp",
+};
+
 static int asoc_ssp_probe(struct platform_device *pdev)
 {
-	return snd_soc_register_dai(&pdev->dev, &pxa_ssp_dai);
+	return snd_soc_register_component(&pdev->dev, &pxa_ssp_component,
+					  &pxa_ssp_dai, 1);
 }
 
 static int asoc_ssp_remove(struct platform_device *pdev)
 {
-	snd_soc_unregister_dai(&pdev->dev);
+	snd_soc_unregister_component(&pdev->dev);
 	return 0;
 }