Permalink
Browse files

ALSA: sh: Fix up namespace collision in sh_dac_audio.

The module_platform_driver() conversion ended up tripping over the driver
name, leading to confusion in the macro with regards to 'driver' being
redefined. rename it to something slightly more suitable to avoid
namespace collisions.

sound/sh/sh_dac_audio.c:444:122: error: conflicting types for 'driver_init'
include/linux/device.h:773:6: note: previous declaration of 'driver_init' was here
make[3]: *** [sound/sh/sh_dac_audio.o] Error 1

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information...
1 parent e182534 commit d4c6983859a82422640c727d2426b435dfff56f4 Paul Mundt committed with May 21, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 sound/sh/sh_dac_audio.c
View
@@ -433,12 +433,12 @@ 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 = {
.name = "dac_audio",
},
};
-module_platform_driver(driver);
+module_platform_driver(sh_dac_driver);

0 comments on commit d4c6983

Please sign in to comment.