X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=sound%2Fsynth%2Femux%2Femux_oss.c;h=ac75816ada7c31b133586693e5c73a41dc79348f;hb=06d1ee32a4d25356a710b49d5e95dbdd68bdf505;hp=82e350e9501ccc0d5ebc82962f60c034466448eb;hpb=a585d2b738bfa26326b3f1f40f0f1eda0c067ccf;p=uclinux-h8%2Flinux.git

diff --git a/sound/synth/emux/emux_oss.c b/sound/synth/emux/emux_oss.c
index 82e350e9501c..ac75816ada7c 100644
--- a/sound/synth/emux/emux_oss.c
+++ b/sound/synth/emux/emux_oss.c
@@ -69,7 +69,8 @@ snd_emux_init_seq_oss(struct snd_emux *emu)
 	struct snd_seq_oss_reg *arg;
 	struct snd_seq_device *dev;
 
-	if (snd_seq_device_new(emu->card, 0, SNDRV_SEQ_DEV_ID_OSS,
+	/* using device#1 here for avoiding conflicts with OPL3 */
+	if (snd_seq_device_new(emu->card, 1, SNDRV_SEQ_DEV_ID_OSS,
 			       sizeof(struct snd_seq_oss_reg), &dev) < 0)
 		return;