diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-05-21 18:21:54 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-21 11:31:14 +0200 |
| commit | d4c6983859a82422640c727d2426b435dfff56f4 (patch) | |
| tree | bd0d463ee8e3f7709087d44887fc9f3cdd4c9f10 /sound/sh | |
| parent | e182534d4bd3a779941f2868f35e1f66a8d36cea (diff) | |
| download | linux-stable-d4c6983859a82422640c727d2426b435dfff56f4.tar.gz linux-stable-d4c6983859a82422640c727d2426b435dfff56f4.tar.bz2 linux-stable-d4c6983859a82422640c727d2426b435dfff56f4.zip | |
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>
Diffstat (limited to 'sound/sh')
| -rw-r--r-- | sound/sh/sh_dac_audio.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |