From: Paul Mundt Date: Mon, 21 May 2012 09:21:54 +0000 (+0900) Subject: ALSA: sh: Fix up namespace collision in sh_dac_audio. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d4c6983859a82422640c727d2426b435dfff56f4;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Takashi Iwai --- diff --git a/sound/sh/sh_dac_audio.c b/sound/sh/sh_dac_audio.c index b11f82b5718f..f8b01c77b298 100644 --- a/sound/sh/sh_dac_audio.c +++ b/sound/sh/sh_dac_audio.c @@ -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);