d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tidy up stray or bogus #if NFOO > 0 and #include "foo.h".

Browse Source
This commit is contained in:
Peter Wemm 2000-01-29 18:48:30 +00:00
parent 96e00123b4
commit 5775b1a2b6
6 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/sound/pci/aureal.c
View File

@ -26,9 +26,6 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#include "pci.h"
#include "pcm.h"
#include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/sound.h>
#include <dev/sound/pcm/ac97.h> #include <dev/sound/pcm/ac97.h>
#include <dev/sound/pci/aureal.h> #include <dev/sound/pci/aureal.h>

10
sys/dev/sound/pci/csa.c
View File

@ -30,8 +30,6 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#include "pci.h"
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@ -47,10 +45,8 @@
#include <dev/sound/pci/csareg.h> #include <dev/sound/pci/csareg.h>
#include <dev/sound/pci/csavar.h> #include <dev/sound/pci/csavar.h>
#if NPCI > 0
#include <pci/pcireg.h> #include <pci/pcireg.h>
#include <pci/pcivar.h> #include <pci/pcivar.h>
#endif /* NPCI > 0 */
#include <dev/sound/pci/csaimg.h> #include <dev/sound/pci/csaimg.h>
@ -74,10 +70,8 @@ struct csa_softc {
typedef struct csa_softc *sc_p; typedef struct csa_softc *sc_p;
#if NPCI > 0
static int csa_probe(device_t dev); static int csa_probe(device_t dev);
static int csa_attach(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, 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); 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, 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; static devclass_t csa_devclass;
#if NPCI > 0
static int static int
csa_probe(device_t dev) csa_probe(device_t dev)
{ {
@ -223,7 +216,6 @@ csa_attach(device_t dev)
return (0); return (0);
} }
#endif /* NPCI > 0 */
static struct resource * static struct resource *
csa_alloc_resource(device_t bus, device_t child, int type, int *rid, 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); 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[] = { static device_method_t csa_methods[] = {
/* Device interface */ /* Device interface */
DEVMETHOD(device_probe, csa_probe), DEVMETHOD(device_probe, csa_probe),
@ -934,4 +925,3 @@ static driver_t csa_driver = {
* csa can be attached to a pci bus. * csa can be attached to a pci bus.
*/ */
DRIVER_MODULE(csa, pci, csa_driver, csa_devclass, 0, 0); DRIVER_MODULE(csa, pci, csa_driver, csa_devclass, 0, 0);
#endif /* NPCI > 0 */

3
sys/dev/sound/pci/es137x.c
View File

@ -50,9 +50,6 @@
* *
*/ */
#include "pci.h"
#include "pcm.h"
#include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/sound.h>
#include <dev/sound/pcm/ac97.h> #include <dev/sound/pcm/ac97.h>
#include <dev/sound/pci/es137x.h> #include <dev/sound/pci/es137x.h>

3
sys/dev/sound/pci/neomagic.c
View File

@ -28,9 +28,6 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#include "pci.h"
#include "pcm.h"
#include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/sound.h>
#include <dev/sound/pcm/ac97.h> #include <dev/sound/pcm/ac97.h>
#include <dev/sound/pci/neomagic.h> #include <dev/sound/pci/neomagic.h>

3
sys/dev/sound/pci/t4dwave.c
View File

@ -26,9 +26,6 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#include "pci.h"
#include "pcm.h"
#include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/sound.h>
#include <dev/sound/pcm/ac97.h> #include <dev/sound/pcm/ac97.h>
#include <dev/sound/pci/t4dwave.h> #include <dev/sound/pci/t4dwave.h>

2
sys/dev/sound/pcm/fake.c
View File

@ -26,8 +26,6 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#include "pcm.h"
#include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/sound.h>
/* channel interface */ /* channel interface */