From: Takashi Iwai Date: Fri, 20 Jan 2006 13:03:06 +0000 (+0100) Subject: [ALSA] opl3sa2 - Fix conflict of driver name on sysfs X-Git-Tag: v2.6.16-rc2~1^2~7^2~24 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62af9905a1f809094f5209ae15d2ce69599a8123;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git [ALSA] opl3sa2 - Fix conflict of driver name on sysfs Modules: OPL3SA2 driver Fix the conflict of driver name 'opl3sa2' on sysfs with OSS driver. Signed-off-by: Takashi Iwai --- diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index 84ffa8f..9dc6b20 100644 --- a/sound/isa/opl3sa2.c +++ b/sound/isa/opl3sa2.c @@ -781,7 +781,7 @@ static int snd_opl3sa2_pnp_resume(struct pnp_dev *pdev) #endif static struct pnp_driver opl3sa2_pnp_driver = { - .name = "opl3sa2-pnpbios", + .name = "snd-opl3sa2-pnpbios", .id_table = snd_opl3sa2_pnpbiosids, .probe = snd_opl3sa2_pnp_detect, .remove = __devexit_p(snd_opl3sa2_pnp_remove), @@ -848,7 +848,7 @@ static int snd_opl3sa2_pnp_cresume(struct pnp_card_link *pcard) static struct pnp_card_driver opl3sa2_pnpc_driver = { .flags = PNP_DRIVER_RES_DISABLE, - .name = "opl3sa2", + .name = "snd-opl3sa2-cpnp", .id_table = snd_opl3sa2_pnpids, .probe = snd_opl3sa2_pnp_cdetect, .remove = __devexit_p(snd_opl3sa2_pnp_cremove),