leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: sh: Fix up namespace collision in sh_dac_audio.

Browse Source 
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>
This commit is contained in:
Paul Mundt 2012-05-21 18:21:54 +09:00 committed by Takashi Iwai
parent e182534d4b
commit d4c6983859
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/sh/sh_dac_audio.c
View File

@ -433,7 +433,7 @@ probe_error:
/* /*
* "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 = {
}, },
}; };
module_platform_driver(driver); module_platform_driver(sh_dac_driver);