From b3f6dc3da2411754cf60b1415b27ec178e3aff35 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Thu, 21 Mar 2013 03:34:12 -0700
Subject: [PATCH] --- yaml --- r: 371839 b: refs/heads/master c:
 e580f1ced92e0911cce71c3cae7c6e82159c82b4 h: refs/heads/master i:   371837:
 3f758634351e8233ade27b25a1c14103ff6cd3d4   371835:
 91c2e9501f45c58222e31b418e514bd0a088d4a6   371831:
 5b1f8dfade35ac88c888042a2b11efd4a8458c9f   371823:
 72e2c91df07645fe4597ab63bfcafae5ab7197a0   371807:
 7fabd7097d407b7caa166739a00dfd36e0795c80   371775:
 a5f5b5110f98cce1a28748d668d9b8793bdbd41b   371711:
 b6d643fb3cbf88f2a24ea5ff0dec012c7c6939a6 v: v3

---
 [refs]                        | 2 +-
 trunk/sound/soc/pxa/pxa-ssp.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2d646ac64f26..6f445e15cdad 100644
--- 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
index d3eb0c2eec77..6f4dd7543e82 100644
--- 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;
 }