aboutsummaryrefslogtreecommitdiff
path: root/sys/conf/options
diff options
context:
space:
mode:
authorMarius Strobl <marius@FreeBSD.org>2006-06-12 21:07:13 +0000
committerMarius Strobl <marius@FreeBSD.org>2006-06-12 21:07:13 +0000
commitacb8c14985b436c339f8bafa0988e84533b80422 (patch)
treeda4439ea5709e5618e109faeee8993d3a0aa0ad5 /sys/conf/options
parented5c24e27da353299c3c319243f57d60cba88db0 (diff)
downloadsrc-acb8c14985b436c339f8bafa0988e84533b80422.tar.gz
src-acb8c14985b436c339f8bafa0988e84533b80422.zip
Make the ISAPNP code optional and only enable it on i386 and pc98 (used
for CBUS-PNP cards there) by default, as there are no amd64 and sparc64 machines with ISA slots and which therefore could make use of this code known to exist. For sparc64 this additionally allows to get rid of the compat shims for in{b,w,l}()/out{b,w,l}() etc and the associated hacks. OK'ed by: imp, peter
Notes
Notes: svn path=/head/; revision=159552
Diffstat (limited to 'sys/conf/options')
-rw-r--r--sys/conf/options5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/conf/options b/sys/conf/options
index 531b07b41b88..e55fc8fcc1df 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -615,13 +615,16 @@ ACPI_MAX_THREADS opt_acpi.h
ACPI_NO_SEMAPHORES opt_acpi.h
ACPICA_PEDANTIC opt_acpi.h
+# ISA support
+DEV_ISA opt_isa.h
+ISAPNP opt_isa.h
+
# options for DEVFS, see sys/fs/devfs/devfs.h
NDEVFSINO opt_devfs.h
NDEVFSOVERFLOW opt_devfs.h
# various 'device presence' options.
DEV_BPF opt_bpf.h
-DEV_ISA opt_isa.h
DEV_MCA opt_mca.h
DEV_CARP opt_carp.h
DEV_SPLASH opt_splash.h