(hopefully) fix build breakage some people are seeing

Approved by:	re

6 files changed, 7 insertions, 7 deletions

diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c
index d79626b..96c2c66 100644
--- a/sys/dev/sound/pci/aureal.c
+++ b/sys/dev/sound/pci/aureal.c
@@ -73,7 +73,7 @@ struct au_info {
 	bus_space_handle_t sh[3];
 
 	bus_dma_tag_t	parent_dmat;
-	void *lock;
+	struct mtx *lock;
 
 	u_int32_t	x[32], y[128];
 	char		z[128];
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index 973c8f6..4afdd9e 100644
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -107,7 +107,7 @@ struct sc_info {
 	struct resource		*reg, *irq;
 	int			regid, irqid;
 	void 			*ih;
-	void			*lock;
+	struct mtx		*lock;
 
 	int			spdif_enabled;
 	unsigned int		bufsz;
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index d548377..896a8af 100644
--- a/sys/dev/sound/pci/ds1.c
+++ b/sys/dev/sound/pci/ds1.c
@@ -116,7 +116,7 @@ struct sc_info {
 	struct resource *reg, *irq;
 	int		regid, irqid;
 	void		*ih;
-	void		*lock;
+	struct mtx	*lock;
 
 	void *regbase;
 	u_int32_t *pbase, pbankbase, pbanksize;
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index 0448e8a..e9c99cb 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -96,7 +96,7 @@ struct sc_info {
 
 	struct resource *reg, *irq;
 	void		*ih;
-	void		*lock;
+	struct mtx	*lock;
 
 	unsigned int bufsz;
 	int timer, timerinterval;
diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c
index 8b1343f..c479171 100644
--- a/sys/dev/sound/pci/maestro.c
+++ b/sys/dev/sound/pci/maestro.c
@@ -110,7 +110,7 @@ struct agg_info {
 	bus_addr_t		baseaddr;
 
 	struct ac97_info	*codec;
-	void			*lock;
+	struct mtx		*lock;
 
 	unsigned int		bufsz;
 	u_int			playchns, active;
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index c34fe39..1e88667 100644
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -81,7 +81,7 @@ struct tr_info {
 	int regtype, regid, irqid;
 	void *ih;
 
-	void *lock;
+	struct mtx *lock;
 
 	u_int32_t playchns;
 	unsigned int bufsz;
@@ -262,7 +262,7 @@ tr_wrcd(kobj_t obj, void *devinfo, int regno, u_int32_t data)
 		}
 	}
 	if (tr->type != ALI_PCI_ID || i > 0) {
-		for (i=TR_TIMEOUT_CDC; (i>0) && (j & trw); i--) 
+		for (i=TR_TIMEOUT_CDC; (i>0) && (j & trw); i--)
 			j=tr_rd(tr, treg, 4);
 		if (tr->type == ALI_PCI_ID && tr->rev > 0x01)
 		      	trw |= 0x0100;