diff options
| author | marius <marius@FreeBSD.org> | 2006-06-12 21:07:13 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2006-06-12 21:07:13 +0000 |
| commit | 9e60ac43b5ce3518ef71ac90c67969eec3282762 (patch) | |
| tree | da4439ea5709e5618e109faeee8993d3a0aa0ad5 /sys/conf | |
| parent | ec7a44920791ea14b9eb51468503285eaf116c8a (diff) | |
| download | FreeBSD-src-9e60ac43b5ce3518ef71ac90c67969eec3282762.zip FreeBSD-src-9e60ac43b5ce3518ef71ac90c67969eec3282762.tar.gz | |
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
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files | 4 | ||||
| -rw-r--r-- | sys/conf/options | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files index 21502b0..8455bc8 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1245,8 +1245,8 @@ isa/isa_if.m standard isa/isa_common.c optional isa isa/isahint.c optional isa isa/orm.c optional isa -isa/pnp.c optional isa -isa/pnpparse.c optional isa +isa/pnp.c optional isa isapnp +isa/pnpparse.c optional isa isapnp isofs/cd9660/cd9660_bmap.c optional cd9660 isofs/cd9660/cd9660_lookup.c optional cd9660 isofs/cd9660/cd9660_node.c optional cd9660 diff --git a/sys/conf/options b/sys/conf/options index 531b07b..e55fc8f 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 |
