]> git.baikalelectronics.ru Git - kernel.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)
commit87e61b86bfa5ee64a5a3a187a40efcea2d16f07d
treebd0d463ee8e3f7709087d44887fc9f3cdd4c9f10
parent01a46c76a7b886fe01a706c08fc71641e40dc4ad
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