diff options
author | peter <peter@FreeBSD.org> | 2000-01-29 18:48:30 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2000-01-29 18:48:30 +0000 |
commit | 7760fba064a2cac418dcc14ab6dbcd195b67a6c5 (patch) | |
tree | 54285f406202288a7087589317938e5943735d38 | |
parent | 1129f8f225288f0e2619f7c7188d73eda608f268 (diff) | |
download | FreeBSD-src-7760fba064a2cac418dcc14ab6dbcd195b67a6c5.zip FreeBSD-src-7760fba064a2cac418dcc14ab6dbcd195b67a6c5.tar.gz |
Tidy up stray or bogus #if NFOO > 0 and #include "foo.h".
-rw-r--r-- | sys/dev/sound/pci/aureal.c | 3 | ||||
-rw-r--r-- | sys/dev/sound/pci/csa.c | 10 | ||||
-rw-r--r-- | sys/dev/sound/pci/es137x.c | 3 | ||||
-rw-r--r-- | sys/dev/sound/pci/neomagic.c | 3 | ||||
-rw-r--r-- | sys/dev/sound/pci/t4dwave.c | 3 | ||||
-rw-r--r-- | sys/dev/sound/pcm/fake.c | 2 |
6 files changed, 0 insertions, 24 deletions
diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c index e35db34..168f6b1 100644 --- a/sys/dev/sound/pci/aureal.c +++ b/sys/dev/sound/pci/aureal.c @@ -26,9 +26,6 @@ * $FreeBSD$ */ -#include "pci.h" -#include "pcm.h" - #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/ac97.h> #include <dev/sound/pci/aureal.h> diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 2a23869..c409fb0 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -30,8 +30,6 @@ * $FreeBSD$ */ -#include "pci.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -47,10 +45,8 @@ #include <dev/sound/pci/csareg.h> #include <dev/sound/pci/csavar.h> -#if NPCI > 0 #include <pci/pcireg.h> #include <pci/pcivar.h> -#endif /* NPCI > 0 */ #include <dev/sound/pci/csaimg.h> @@ -74,10 +70,8 @@ struct csa_softc { typedef struct csa_softc *sc_p; -#if NPCI > 0 static int csa_probe(device_t dev); static int csa_attach(device_t dev); -#endif /* NPCI > 0 */ static struct resource *csa_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags); static int csa_release_resource(device_t bus, device_t child, int type, int rid, @@ -95,7 +89,6 @@ static int csa_transferimage(csa_res *resp, u_long *src, u_long dest, u_long len static devclass_t csa_devclass; -#if NPCI > 0 static int csa_probe(device_t dev) { @@ -223,7 +216,6 @@ csa_attach(device_t dev) return (0); } -#endif /* NPCI > 0 */ static struct resource * csa_alloc_resource(device_t bus, device_t child, int type, int *rid, @@ -902,7 +894,6 @@ csa_writemem(csa_res *resp, u_long offset, u_int32_t data) bus_space_write_4(rman_get_bustag(resp->mem), rman_get_bushandle(resp->mem), offset, data); } -#if NPCI > 0 static device_method_t csa_methods[] = { /* Device interface */ DEVMETHOD(device_probe, csa_probe), @@ -934,4 +925,3 @@ static driver_t csa_driver = { * csa can be attached to a pci bus. */ DRIVER_MODULE(csa, pci, csa_driver, csa_devclass, 0, 0); -#endif /* NPCI > 0 */ diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index c4c04b6..e25a051 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -50,9 +50,6 @@ * */ -#include "pci.h" -#include "pcm.h" - #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/ac97.h> #include <dev/sound/pci/es137x.h> diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c index f139d93..8966d82 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -28,9 +28,6 @@ * $FreeBSD$ */ -#include "pci.h" -#include "pcm.h" - #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/ac97.h> #include <dev/sound/pci/neomagic.h> diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index 924cc6e..fbde2ff 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -26,9 +26,6 @@ * $FreeBSD$ */ -#include "pci.h" -#include "pcm.h" - #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/ac97.h> #include <dev/sound/pci/t4dwave.h> diff --git a/sys/dev/sound/pcm/fake.c b/sys/dev/sound/pcm/fake.c index 68ef6d3..d3368c0 100644 --- a/sys/dev/sound/pcm/fake.c +++ b/sys/dev/sound/pcm/fake.c @@ -26,8 +26,6 @@ * $FreeBSD$ */ -#include "pcm.h" - #include <dev/sound/pcm/sound.h> /* channel interface */ |