summaryrefslogtreecommitdiffstats
path: root/sys/conf/files.amd64
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2012-03-09 19:42:48 +0000
committerjhb <jhb@FreeBSD.org>2012-03-09 19:42:48 +0000
commitd6f48ea8cc824233cf311f52698aa98f62065584 (patch)
treebf27eb31fac1ca30ea2152bdc3f12d14df7dd127 /sys/conf/files.amd64
parent54d8cc97bcf8a99f389868615106ee6be57bdd11 (diff)
downloadFreeBSD-src-d6f48ea8cc824233cf311f52698aa98f62065584.zip
FreeBSD-src-d6f48ea8cc824233cf311f52698aa98f62065584.tar.gz
Allow a native i386 kernel to be built with 'nodevice atpic'. Just as on
amd64, if 'device isa' is present quiesce the 8259A's during boot and resume from suspend. While here, be more selective on amd64 about which kernel configurations need elcr.c. MFC after: 2 weeks
Diffstat (limited to 'sys/conf/files.amd64')
-rw-r--r--sys/conf/files.amd642
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 8ab1cbc..b5c4fb4 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -466,7 +466,7 @@ x86/cpufreq/p4tcc.c optional cpufreq
x86/isa/atpic.c optional atpic isa
x86/isa/atrtc.c standard
x86/isa/clock.c standard
-x86/isa/elcr.c standard
+x86/isa/elcr.c optional atpic isa | mptable
x86/isa/isa.c standard
x86/isa/isa_dma.c standard
x86/isa/nmi.c standard
OpenPOWER on IntegriCloud