diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2001-01-29 11:38:39 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2001-01-29 11:38:39 +0000 |
| commit | 93cd41f72d524d0499f2933769a610789437a2d2 (patch) | |
| tree | 37bc29a2e8808114212fac8dd8fb4b53da3938ec | |
| parent | 0634b4a7b2037dff57d09ac1278a828e48f6e1d4 (diff) | |
| download | src-93cd41f72d524d0499f2933769a610789437a2d2.tar.gz src-93cd41f72d524d0499f2933769a610789437a2d2.zip | |
Zap silly #if NPCI > 0 and the hoops that we jump through for the module
case. Use an 'and' case in conf/files so that it only gets compiled if
pci is present.
Notes
Notes:
svn path=/head/; revision=71795
| -rw-r--r-- | sys/conf/files | 2 | ||||
| -rw-r--r-- | sys/dev/tdfx/tdfx_pci.c | 9 | ||||
| -rw-r--r-- | sys/modules/3dfx/Makefile | 7 |
3 files changed, 2 insertions, 16 deletions
diff --git a/sys/conf/files b/sys/conf/files index f76e6d2b77ad..1b2378c21d29 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -489,7 +489,7 @@ dev/stg/tmc18c30_pccard.c optional stg card dev/stg/tmc18c30_isa.c optional stg isa dev/sym/sym_hipd.c optional sym \ dependency "$S/dev/sym/sym_{conf,defs}.h" -dev/tdfx/tdfx_pci.c optional tdfx +dev/tdfx/tdfx_pci.c optional tdfx pci dev/twe/twe.c optional twe dev/twe/twe_freebsd.c optional twe # diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c index 8339738d4820..d71e9c142e7a 100644 --- a/sys/dev/tdfx/tdfx_pci.c +++ b/sys/dev/tdfx/tdfx_pci.c @@ -38,12 +38,6 @@ * and Jens Axboe, located at http://linux.3dfx.com. */ -/* - * put this here, so as to bail out immediately if we have no PCI BUS installed - */ -#include "pci.h" -#if NPCI > 0 - #include <sys/param.h> #include <sys/bus_private.h> @@ -871,6 +865,3 @@ static driver_t tdfx_driver = { /* Tell Mr. Kernel about us! */ DRIVER_MODULE(tdfx, pci, tdfx_driver, tdfx_devclass, 0, 0); - - -#endif /* NPCI */ diff --git a/sys/modules/3dfx/Makefile b/sys/modules/3dfx/Makefile index 5c676213a85b..4973bb4e97dd 100644 --- a/sys/modules/3dfx/Makefile +++ b/sys/modules/3dfx/Makefile @@ -6,12 +6,10 @@ MAINTAINER= cokane@FreeBSD.org KMOD= 3dfx NOMAN= YES -SRCS= opt_tdfx.h pci.h bus_if.h pci_if.h device_if.h tdfx_pci.h tdfx_io.h\ +SRCS= opt_tdfx.h bus_if.h pci_if.h device_if.h tdfx_pci.h tdfx_io.h\ tdfx_vars.h tdfx_pci.c INCSRC= ../../sys -CLEANFILES= pci.h - .if ${MACHINE_ARCH} == "i386" # This line enables linux ioctl handling by default # comment out if you don't want it @@ -21,9 +19,6 @@ TDFX_OPTS= "\#define TDFX_LINUX" # Uncomment this for debugging messages #CFLAGS+= -DDEBUG -pci.h: - echo "#define NPCI 1" > pci.h - opt_tdfx.h: touch opt_tdfx.h echo $(TDFX_OPTS) >> opt_tdfx.h |