mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-10-31 18:09:19 +00:00
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>
This commit is contained in:
parent
e182534d4b
commit
d4c6983859
1 changed files with 2 additions and 2 deletions
|
@ -433,7 +433,7 @@ probe_error:
|
|||
/*
|
||||
* "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);
|
||||
|
|
Loading…
Reference in a new issue