diff --git a/[refs] b/[refs]
index 533d2e947515..6227ead5e6b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e182534d4bd3a779941f2868f35e1f66a8d36cea
+refs/heads/master: d4c6983859a82422640c727d2426b435dfff56f4
diff --git a/trunk/sound/sh/sh_dac_audio.c b/trunk/sound/sh/sh_dac_audio.c
index b11f82b5718f..f8b01c77b298 100644
--- a/trunk/sound/sh/sh_dac_audio.c
+++ b/trunk/sound/sh/sh_dac_audio.c
@@ -433,7 +433,7 @@ static int __devinit snd_sh_dac_probe(struct platform_device *devptr)
 /*
  * "driver" definition
  */
-static struct platform_driver driver = {
+static struct platform_driver sh_dac_driver = {
 	.probe	= snd_sh_dac_probe,
 	.remove = snd_sh_dac_remove,
 	.driver = {
@@ -441,4 +441,4 @@ static struct platform_driver driver = {
 	},
 };
 
-module_platform_driver(driver);
+module_platform_driver(sh_dac_driver);