]> git.karo-electronics.de Git - linux-beck.git/commit
ALSA: sh: Fix up namespace collision in sh_dac_audio.
authorPaul Mundt <lethal@linux-sh.org>
Mon, 21 May 2012 09:21:54 +0000 (18:21 +0900)
committerTakashi Iwai <tiwai@suse.de>
Mon, 21 May 2012 09:31:14 +0000 (11:31 +0200)
commitd4c6983859a82422640c727d2426b435dfff56f4
treebd0d463ee8e3f7709087d44887fc9f3cdd4c9f10
parente182534d4bd3a779941f2868f35e1f66a8d36cea
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>
sound/sh/sh_dac_audio.c