Commit d4c69838 authored by Paul Mundt's avatar Paul Mundt Committed by Takashi Iwai

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: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e182534d
...@@ -433,7 +433,7 @@ static int __devinit snd_sh_dac_probe(struct platform_device *devptr) ...@@ -433,7 +433,7 @@ static int __devinit snd_sh_dac_probe(struct platform_device *devptr)
/* /*
* "driver" definition * "driver" definition
*/ */
static struct platform_driver driver = { static struct platform_driver sh_dac_driver = {
.probe = snd_sh_dac_probe, .probe = snd_sh_dac_probe,
.remove = snd_sh_dac_remove, .remove = snd_sh_dac_remove,
.driver = { .driver = {
...@@ -441,4 +441,4 @@ static struct platform_driver driver = { ...@@ -441,4 +441,4 @@ static struct platform_driver driver = {
}, },
}; };
module_platform_driver(driver); module_platform_driver(sh_dac_driver);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment