diff --git a/[refs] b/[refs]
index 58793825b465..40596aa4c425 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f25b7feab257bae406f1edb44438a347a1cc727
+refs/heads/master: 62af9905a1f809094f5209ae15d2ce69599a8123
diff --git a/trunk/sound/isa/opl3sa2.c b/trunk/sound/isa/opl3sa2.c
index 84ffa8f0f26d..9dc6b20e9a5c 100644
--- a/trunk/sound/isa/opl3sa2.c
+++ b/trunk/sound/isa/opl3sa2.c
@@ -781,7 +781,7 @@ static int snd_opl3sa2_pnp_resume(struct pnp_dev *pdev)
 #endif
 
 static struct pnp_driver opl3sa2_pnp_driver = {
-	.name = "opl3sa2-pnpbios",
+	.name = "snd-opl3sa2-pnpbios",
 	.id_table = snd_opl3sa2_pnpbiosids,
 	.probe = snd_opl3sa2_pnp_detect,
 	.remove = __devexit_p(snd_opl3sa2_pnp_remove),
@@ -848,7 +848,7 @@ static int snd_opl3sa2_pnp_cresume(struct pnp_card_link *pcard)
 
 static struct pnp_card_driver opl3sa2_pnpc_driver = {
 	.flags = PNP_DRIVER_RES_DISABLE,
-	.name = "opl3sa2",
+	.name = "snd-opl3sa2-cpnp",
 	.id_table = snd_opl3sa2_pnpids,
 	.probe = snd_opl3sa2_pnp_cdetect,
 	.remove = __devexit_p(snd_opl3sa2_pnp_cremove),