summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/conf/options.amd641
-rw-r--r--sys/conf/options.i3861
-rw-r--r--sys/dev/sio/sio_isa.c4
3 files changed, 6 insertions, 0 deletions
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 79bc816..258b0b7 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -30,6 +30,7 @@ COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h
CONSPEED opt_sio.h
GDBSPEED opt_sio.h
+COM_NO_ACPI opt_sio.h
VGA_ALT_SEQACCESS opt_vga.h
VGA_DEBUG opt_vga.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 2325fd9..3fc3fb1 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -80,6 +80,7 @@ COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h
CONSPEED opt_sio.h
GDBSPEED opt_sio.h
+COM_NO_ACPI opt_sio.h
VGA_ALT_SEQACCESS opt_vga.h
VGA_DEBUG opt_vga.h
diff --git a/sys/dev/sio/sio_isa.c b/sys/dev/sio/sio_isa.c
index afb6fac..da8b61c 100644
--- a/sys/dev/sio/sio_isa.c
+++ b/sys/dev/sio/sio_isa.c
@@ -25,6 +25,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_sio.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
@@ -167,4 +169,6 @@ sio_isa_attach(dev)
}
DRIVER_MODULE(sio, isa, sio_isa_driver, sio_devclass, 0, 0);
+#ifndef COM_NO_ACPI
DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0);
+#endif
OpenPOWER on IntegriCloud