Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/dev/isa/gus.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/isa/gus.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.102 retrieving revision 1.103 diff -u -p -r1.102 -r1.103 --- src/sys/dev/isa/gus.c 2008/04/28 20:23:52 1.102 +++ src/sys/dev/isa/gus.c 2008/12/17 20:51:34 1.103 @@ -1,4 +1,4 @@ -/* $NetBSD: gus.c,v 1.102 2008/04/28 20:23:52 martin Exp $ */ +/* $NetBSD: gus.c,v 1.103 2008/12/17 20:51:34 cegger Exp $ */ /*- * Copyright (c) 1996, 1999 The NetBSD Foundation, Inc. @@ -88,7 +88,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.102 2008/04/28 20:23:52 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.103 2008/12/17 20:51:34 cegger Exp $"); #include "gus.h" #if NGUS > 0 @@ -1366,7 +1366,7 @@ gusclose(void *addr) sc->sc_flags &= ~(GUS_OPEN|GUS_LOCKED|GUS_DMAOUT_ACTIVE|GUS_DMAIN_ACTIVE); if (sc->sc_deintr_buf) { - FREE(sc->sc_deintr_buf, M_DEVBUF); + free(sc->sc_deintr_buf, M_DEVBUF); sc->sc_deintr_buf = NULL; } /* turn off speaker, etc. */ @@ -2389,7 +2389,7 @@ gus_round_blocksize(void *addr, int bloc /* set up temporary buffer to hold the deinterleave, if necessary for stereo output */ if (sc->sc_deintr_buf) { - FREE(sc->sc_deintr_buf, M_DEVBUF); + free(sc->sc_deintr_buf, M_DEVBUF); sc->sc_deintr_buf = NULL; } sc->sc_deintr_buf = malloc(blocksize>>1, M_DEVBUF, M_WAITOK);