diff options
author | peter <peter@FreeBSD.org> | 2000-01-29 16:00:34 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2000-01-29 16:00:34 +0000 |
commit | 53ed6e8650db433c8c3ed7b95fc5c89b32c410e9 (patch) | |
tree | 140f309a1ebf7d3a206b2f6aff452c14cd884cc0 /sys/i386 | |
parent | 468e098fa06ecb5ee40aafa0d93eefc5f429c666 (diff) | |
download | FreeBSD-src-53ed6e8650db433c8c3ed7b95fc5c89b32c410e9.zip FreeBSD-src-53ed6e8650db433c8c3ed7b95fc5c89b32c410e9.tar.gz |
Remove #if NFOO > 0 (it's not required in most cases) and also where it
isn't used as a result, remove #include "foo.h". Many of these drivers
still use NFOO for softc struct sizing etc however.
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/isa/rc.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/scd.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/spkr.c | 5 | ||||
-rw-r--r-- | sys/i386/isa/tw.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/wd_cd.c | 6 | ||||
-rw-r--r-- | sys/i386/isa/wfd.c | 5 | ||||
-rw-r--r-- | sys/i386/isa/wst.c | 5 | ||||
-rw-r--r-- | sys/i386/isa/wt.c | 4 |
8 files changed, 0 insertions, 34 deletions
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c index f437eec..ce6dab2 100644 --- a/sys/i386/isa/rc.c +++ b/sys/i386/isa/rc.c @@ -35,7 +35,6 @@ #include "rc.h" -#if NRC > 0 /*#define RCDEBUG*/ #include <sys/param.h> @@ -1452,5 +1451,3 @@ rc_wait0(nec, unit, chan, line) printf("rc%d/%d: channel command timeout, rc.c line: %d\n", unit, chan, line); } - -#endif /* NRC */ diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c index a615f49..b6e9460 100644 --- a/sys/i386/isa/scd.c +++ b/sys/i386/isa/scd.c @@ -48,7 +48,6 @@ #define SCD_DEBUG 0 #include "scd.h" -#if NSCD > 0 #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> @@ -1551,5 +1550,3 @@ scd_toc_entry (int unit, struct ioc_read_toc_single_entry *te) return 0; } - -#endif /* NSCD > 0 */ diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c index f46ff94..8f4b8aa 100644 --- a/sys/i386/isa/spkr.c +++ b/sys/i386/isa/spkr.c @@ -7,10 +7,6 @@ * $FreeBSD$ */ -#include "speaker.h" - -#if NSPEAKER > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -597,5 +593,4 @@ spkr_drvinit(void *unused) SYSINIT(spkrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,spkr_drvinit,NULL) -#endif /* NSPEAKER > 0 */ /* spkr.c ends here */ diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c index be85785..e560dda 100644 --- a/sys/i386/isa/tw.c +++ b/sys/i386/isa/tw.c @@ -33,7 +33,6 @@ */ #include "tw.h" -#if NTW > 0 /* * Driver configuration parameters @@ -1153,5 +1152,3 @@ static int twchecktime(int target, int tol) } } #endif /* HIRESTIME */ - -#endif /* NTW */ diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c index e210a3f..d8f5aa3 100644 --- a/sys/i386/isa/wd_cd.c +++ b/sys/i386/isa/wd_cd.c @@ -28,11 +28,6 @@ * $FreeBSD$ */ -#include "wdc.h" -#include "wcd.h" - -#if NWCD > 0 && NWDC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -1482,4 +1477,3 @@ acd_drvinit(void *unused) } SYSINIT(acddev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, acd_drvinit, NULL) -#endif /* NWCD && NWDC */ diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c index 045d1d8..f8d9e60 100644 --- a/sys/i386/isa/wfd.c +++ b/sys/i386/isa/wfd.c @@ -31,9 +31,6 @@ */ #include "wdc.h" -#include "wfd.h" - -#if NWFD > 0 && NWDC > 0 #include <sys/param.h> #include <sys/systm.h> @@ -728,5 +725,3 @@ static void wfd_drvinit(void *unused) } SYSINIT(wfddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,wfd_drvinit,NULL) - -#endif /* NWFD && NWDC */ diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c index d218325..6ba3762 100644 --- a/sys/i386/isa/wst.c +++ b/sys/i386/isa/wst.c @@ -29,11 +29,8 @@ */ #include "wdc.h" -#include "wst.h" #include "opt_ddb.h" -#if NWST > 0 && NWDC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -775,5 +772,3 @@ wst_drvinit(void *unused) } SYSINIT(wstdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,wst_drvinit,NULL) - -#endif /* NWST && NWDC */ diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c index f7fdebb..4f9d176 100644 --- a/sys/i386/isa/wt.c +++ b/sys/i386/isa/wt.c @@ -58,8 +58,6 @@ */ #include "wt.h" -#if NWT > 0 - #include <sys/param.h> #include <sys/systm.h> @@ -978,5 +976,3 @@ wtstatus (wtinfo_t *t) splx(x); return (1); } - -#endif /* NWT */ |