aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/sound/pci/emu10kx.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/sound/pci/emu10kx.c')
-rw-r--r--sys/dev/sound/pci/emu10kx.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c
index d17f5fb16d34..e642d334f9e8 100644
--- a/sys/dev/sound/pci/emu10kx.c
+++ b/sys/dev/sound/pci/emu10kx.c
@@ -49,7 +49,6 @@
#include "opt_snd.h"
#endif
-#include <dev/sound/chip.h>
#include <dev/sound/pcm/sound.h>
#include <dev/sound/pcm/ac97.h>
@@ -3227,7 +3226,7 @@ emu_pci_attach(device_t dev)
func->func = SCF_PCM;
func->varinfo = pcminfo;
- sc->pcm[RT_FRONT] = device_add_child(dev, "pcm", -1);
+ sc->pcm[RT_FRONT] = device_add_child(dev, "pcm", DEVICE_UNIT_ANY);
device_set_ivars(sc->pcm[RT_FRONT], func);
if (!(sc->mch_disabled)) {
@@ -3247,7 +3246,7 @@ emu_pci_attach(device_t dev)
func->func = SCF_PCM;
func->varinfo = pcminfo;
- sc->pcm[RT_REAR] = device_add_child(dev, "pcm", -1);
+ sc->pcm[RT_REAR] = device_add_child(dev, "pcm", DEVICE_UNIT_ANY);
device_set_ivars(sc->pcm[RT_REAR], func);
if (sc->has_51) {
/* CENTER */
@@ -3266,7 +3265,7 @@ emu_pci_attach(device_t dev)
func->func = SCF_PCM;
func->varinfo = pcminfo;
- sc->pcm[RT_CENTER] = device_add_child(dev, "pcm", -1);
+ sc->pcm[RT_CENTER] = device_add_child(dev, "pcm", DEVICE_UNIT_ANY);
device_set_ivars(sc->pcm[RT_CENTER], func);
/* SUB */
func = malloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT | M_ZERO);
@@ -3284,7 +3283,7 @@ emu_pci_attach(device_t dev)
func->func = SCF_PCM;
func->varinfo = pcminfo;
- sc->pcm[RT_SUB] = device_add_child(dev, "pcm", -1);
+ sc->pcm[RT_SUB] = device_add_child(dev, "pcm", DEVICE_UNIT_ANY);
device_set_ivars(sc->pcm[RT_SUB], func);
}
if (sc->has_71) {
@@ -3304,7 +3303,7 @@ emu_pci_attach(device_t dev)
func->func = SCF_PCM;
func->varinfo = pcminfo;
- sc->pcm[RT_SIDE] = device_add_child(dev, "pcm", -1);
+ sc->pcm[RT_SIDE] = device_add_child(dev, "pcm", DEVICE_UNIT_ANY);
device_set_ivars(sc->pcm[RT_SIDE], func);
}
} /* mch_disabled */
@@ -3325,7 +3324,7 @@ emu_pci_attach(device_t dev)
func->func = SCF_PCM;
func->varinfo = pcminfo;
- sc->pcm[RT_MCHRECORD] = device_add_child(dev, "pcm", -1);
+ sc->pcm[RT_MCHRECORD] = device_add_child(dev, "pcm", DEVICE_UNIT_ANY);
device_set_ivars(sc->pcm[RT_MCHRECORD], func);
} /*mch_rec */
@@ -3357,7 +3356,7 @@ emu_pci_attach(device_t dev)
}
func->func = SCF_MIDI;
func->varinfo = midiinfo;
- sc->midi[0] = device_add_child(dev, "midi", -1);
+ sc->midi[0] = device_add_child(dev, "midi", DEVICE_UNIT_ANY);
device_set_ivars(sc->midi[0], func);
}
/* Midi Interface 2: Audigy, Audigy 2 (on AudigyDrive) */
@@ -3379,7 +3378,7 @@ emu_pci_attach(device_t dev)
func->func = SCF_MIDI;
func->varinfo = midiinfo;
- sc->midi[1] = device_add_child(dev, "midi", -1);
+ sc->midi[1] = device_add_child(dev, "midi", DEVICE_UNIT_ANY);
device_set_ivars(sc->midi[1], func);
}
#endif