diff options
| author | jhb <jhb@FreeBSD.org> | 2002-11-08 20:04:38 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2002-11-08 20:04:38 +0000 |
| commit | ad9e680296473a3039d6dbebf0ba694d2fa9bd6c (patch) | |
| tree | c2da28cb2c31104faf06e97e24d1fb983b6e8a5c /sys | |
| parent | 257ad7107bfd2b27f906b00c852cec5ca322ca23 (diff) | |
| download | FreeBSD-src-ad9e680296473a3039d6dbebf0ba694d2fa9bd6c.zip FreeBSD-src-ad9e680296473a3039d6dbebf0ba694d2fa9bd6c.tar.gz | |
Make 3dfx i386-only. The memrange API it uses may be defined in an MI
header, but it is only implemented on i386.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/NOTES | 12 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 12 | ||||
| -rw-r--r-- | sys/modules/Makefile | 6 |
3 files changed, 15 insertions, 15 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index c5f4380..716144e 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1126,18 +1126,6 @@ options SC_NO_SUSPEND_VTYSWITCH # Optional devices: # -# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create -# the /dev/3dfx0 device to work with glide implementations. This should get -# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as -# the tdfx DRI module from XFree86 and is completely unrelated. -# -# To enable Linuxulator support, one must also include COMPAT_LINUX in the -# config as well, or you will not have the dependencies. The other option -# is to load both as modules. - -device tdfx # Enable 3Dfx Voodoo support -options TDFX_LINUX # Enable Linuxulator support - # # SCSI host adapters: # diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 5283218..07a5e25 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -392,6 +392,18 @@ hint.npx.0.irq="13" # Optional devices: # +# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create +# the /dev/3dfx0 device to work with glide implementations. This should get +# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as +# the tdfx DRI module from XFree86 and is completely unrelated. +# +# To enable Linuxulator support, one must also include COMPAT_LINUX in the +# config as well, or you will not have the dependencies. The other option +# is to load both as modules. + +device tdfx # Enable 3Dfx Voodoo support +options TDFX_LINUX # Enable Linuxulator support + # # ACPI support using the Intel ACPI Component Architecture reference # implementation. diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 1547194..59a8276 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -12,8 +12,7 @@ _random= random # ncp \ # nwfs \ -SUBDIR= 3dfx \ - accf_data \ +SUBDIR= accf_data \ accf_http \ agp \ aha \ @@ -152,7 +151,8 @@ SUBDIR+=syscons # 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. .if ${MACHINE_ARCH} == "i386" -SUBDIR+=aic \ +SUBDIR+=3dfx \ + aic \ aout \ apm \ ar \ |
