summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-07-09 22:23:16 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-07-09 22:23:16 +0000
commitab7f8f44143e2d2de779c606665c533a36ea4897 (patch)
treec0eb61ca3c7bc02dc4e59e07c0e40d249b939aae /sys/dev
parent00d33fc9a83a6a13bab94e7fd92dafa6cf1008a4 (diff)
Do not #include "foo.h" and keep the whole file between #if NFOO >0 ... #endif,
config(8) will not bring us into play unless NFOO > 0 anyway.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sbus/cs4231.c7
-rw-r--r--sys/dev/sbus/magma.c7
2 files changed, 2 insertions, 12 deletions
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 */