summaryrefslogtreecommitdiffstats
path: root/sys/modules
diff options
context:
space:
mode:
authoryar <yar@FreeBSD.org>2006-03-03 21:37:38 +0000
committeryar <yar@FreeBSD.org>2006-03-03 21:37:38 +0000
commit0ac62e02bddc3f1147599efe9997fc4b09f1d642 (patch)
treeb7e59bc8adbf6c361ddff54ef270aeb9ea0797a1 /sys/modules
parentd8eb71788e7982c0eaa5e7cd8dfa13fe8d89f563 (diff)
downloadFreeBSD-src-0ac62e02bddc3f1147599efe9997fc4b09f1d642.zip
FreeBSD-src-0ac62e02bddc3f1147599efe9997fc4b09f1d642.tar.gz
Take the functionality contained in the former "options TDFX_LINUX"
into a separate module. Accordingly, convert the option into a device named similarly. Note for MFC: Perhaps the option should stay in RELENG_6 for POLA reasons. Suggested by: scottl Reviewed by: cokane MFC after: 5 days
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/3dfx/Makefile13
-rw-r--r--sys/modules/3dfx_linux/Makefile8
-rw-r--r--sys/modules/Makefile2
3 files changed, 11 insertions, 12 deletions
diff --git a/sys/modules/3dfx/Makefile b/sys/modules/3dfx/Makefile
index 208e9a7..ac7730b 100644
--- a/sys/modules/3dfx/Makefile
+++ b/sys/modules/3dfx/Makefile
@@ -5,22 +5,11 @@ MAINTAINER= cokane@FreeBSD.org
.PATH: $(.CURDIR)/../../dev/tdfx
KMOD= 3dfx
-SRCS= opt_tdfx.h bus_if.h pci_if.h device_if.h tdfx_pci.h tdfx_io.h\
+SRCS= bus_if.h pci_if.h device_if.h tdfx_pci.h tdfx_io.h\
tdfx_vars.h tdfx_pci.c
INCSRC= ../../sys
-.if ${MACHINE_ARCH} == "i386"
-# This line enables linux ioctl handling by default
-# comment out if you don't want it
-TDFX_OPTS= "\#define TDFX_LINUX"
-.endif
-
# Uncomment this for debugging messages
#CFLAGS+= -DDEBUG
-.if !defined(KERNBUILDDIR)
-opt_tdfx.h:
- echo $(TDFX_OPTS) > opt_tdfx.h
-.endif
-
.include <bsd.kmod.mk>
diff --git a/sys/modules/3dfx_linux/Makefile b/sys/modules/3dfx_linux/Makefile
new file mode 100644
index 0000000..8376037
--- /dev/null
+++ b/sys/modules/3dfx_linux/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../dev/tdfx
+
+KMOD= 3dfx_linux
+SRCS= tdfx_linux.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 030e51e..5462624 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
SUBDIR= ${_3dfx} \
+ ${_3dfx_linux} \
${_aac} \
accf_data \
accf_http \
@@ -317,6 +318,7 @@ _pflog= pflog
# XXX some of these can move to the general case when de-i386'ed
# XXX some of these can move now, but are untested on other architectures.
_3dfx= 3dfx
+_3dfx_linux= 3dfx_linux
_agp= agp
_aic= aic
_amd= amd
OpenPOWER on IntegriCloud