diff --git a/[refs] b/[refs]
index cba95c27d330..e1b7bd93f356 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02db110351019eef2d6b10e08162dd370542e9fd
+refs/heads/master: fe4085e84f17a57a533a210a626e0cc9ead381f9
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index 29dbbd793fc6..7978f6c01ef7 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -1645,6 +1645,10 @@ static int soc_probe(struct platform_device *pdev)
 	if (!card)
 		return -EINVAL;
 
+	dev_warn(&pdev->dev,
+		 "ASoC machine %s should use snd_soc_register_card()\n",
+		 card->name);
+
 	/* Bodge while we unpick instantiation */
 	card->dev = &pdev->dev;