summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/sparc/dev/amd7930.c6
-rw-r--r--sys/arch/sparc/dev/cs4231.c7
-rw-r--r--sys/arch/sparc64/dev/ce4231.c7
-rw-r--r--sys/dev/sbus/cs4231.c7
-rw-r--r--sys/dev/sbus/magma.c7
5 files changed, 5 insertions, 29 deletions
diff --git a/sys/arch/sparc/dev/amd7930.c b/sys/arch/sparc/dev/amd7930.c
index 14c81df10c7..de17fca17c5 100644
--- a/sys/arch/sparc/dev/amd7930.c
+++ b/sys/arch/sparc/dev/amd7930.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amd7930.c,v 1.28 2004/09/29 07:35:11 miod Exp $ */
+/* $OpenBSD: amd7930.c,v 1.29 2005/07/09 22:23:13 miod Exp $ */
/* $NetBSD: amd7930.c,v 1.37 1998/03/30 14:23:40 pk Exp $ */
/*
@@ -31,9 +31,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "audio.h"
-#if NAUDIO > 0
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/errno.h>
@@ -845,4 +842,3 @@ amd7930swintr(sc0)
splx(s);
return (ret);
}
-#endif /* NAUDIO > 0 */
diff --git a/sys/arch/sparc/dev/cs4231.c b/sys/arch/sparc/dev/cs4231.c
index a96bba8fe3a..58cf6c87803 100644
--- a/sys/arch/sparc/dev/cs4231.c
+++ b/sys/arch/sparc/dev/cs4231.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cs4231.c,v 1.23 2005/04/16 21:57:22 mickey Exp $ */
+/* $OpenBSD: cs4231.c,v 1.24 2005/07/09 22:23:13 miod Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -31,9 +31,6 @@
* based on ideas from the S/Linux project and the NetBSD project.
*/
-#include "audio.h"
-#if NAUDIO > 0
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/errno.h>
@@ -1646,5 +1643,3 @@ cs4231_trigger_input(addr, start, end, blksize, intr, arg, param)
return (0);
}
-
-#endif /* NAUDIO > 0 */
diff --git a/sys/arch/sparc64/dev/ce4231.c b/sys/arch/sparc64/dev/ce4231.c
index 30511b488ea..e89bb809d59 100644
--- a/sys/arch/sparc64/dev/ce4231.c
+++ b/sys/arch/sparc64/dev/ce4231.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ce4231.c,v 1.19 2005/04/16 21:57:23 mickey Exp $ */
+/* $OpenBSD: ce4231.c,v 1.20 2005/07/09 22:23:15 miod Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -36,9 +36,6 @@
*
*/
-#include "audio.h"
-#if NAUDIO > 0
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/errno.h>
@@ -1536,5 +1533,3 @@ ce4231_trigger_input(addr, start, end, blksize, intr, arg, param)
{
return (ENXIO);
}
-
-#endif /* NAUDIO > 0 */
diff --git a/sys/dev/sbus/cs4231.c b/sys/dev/sbus/cs4231.c
index b2ed764ddf0..4387f589e0f 100644
--- a/sys/dev/sbus/cs4231.c
+++ b/sys/dev/sbus/cs4231.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cs4231.c,v 1.26 2005/04/16 21:57:23 mickey Exp $ */
+/* $OpenBSD: cs4231.c,v 1.27 2005/07/09 22:23:15 miod Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -36,9 +36,6 @@
* based on ideas from the S/Linux project and the NetBSD project.
*/
-#include "audio.h"
-#if NAUDIO > 0
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/errno.h>
@@ -1624,5 +1621,3 @@ cs4231_trigger_input(void *vsc, void *start, void *end, int blksize,
return (0);
}
-
-#endif /* NAUDIO > 0 */
diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c
index da9ae6d7b44..abdb3b62ad5 100644
--- a/sys/dev/sbus/magma.c
+++ b/sys/dev/sbus/magma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: magma.c,v 1.14 2005/03/08 21:56:23 martin Exp $ */
+/* $OpenBSD: magma.c,v 1.15 2005/07/09 22:23:15 miod Exp $ */
/*
* magma.c
*
@@ -38,9 +38,6 @@
* CD1400 & CD1190 chips
*/
-#include "magma.h"
-#if NMAGMA > 0
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
@@ -1778,5 +1775,3 @@ mbpp_mstohz(int m)
}
return (h);
}
-
-#endif /* NMAGMA */