diff options
| author | Takashi Iwai <tiwai@suse.de> | 2006-01-20 14:03:06 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-22 16:24:58 +0100 |
| commit | 62af9905a1f809094f5209ae15d2ce69599a8123 (patch) | |
| tree | 21fdbaf9b6a58fab6b833532132d968f1c71169b /sound/isa/opl3sa2.c | |
| parent | 2f25b7feab257bae406f1edb44438a347a1cc727 (diff) | |
| download | linux-3.10-62af9905a1f809094f5209ae15d2ce69599a8123.tar.gz linux-3.10-62af9905a1f809094f5209ae15d2ce69599a8123.tar.bz2 linux-3.10-62af9905a1f809094f5209ae15d2ce69599a8123.zip | |
[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 <tiwai@suse.de>
Diffstat (limited to 'sound/isa/opl3sa2.c')
| -rw-r--r-- | sound/isa/opl3sa2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index 84ffa8f0f26..9dc6b20e9a5 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), |