--- //depot/yahoo/ybsd_9/src/sys/dev/ipmi/ipmi_isa.c    2011-11-02 23:46:55.000000000 0000
+++ /home/seanbru/ybsd_9/src/sys/dev/ipmi/ipmi_isa.c    2011-11-02 23:46:55.000000000 0000
@@ -40,6 +40,13 @@
 #include <machine/pci_cfgreg.h>
 #include <dev/pci/pcireg.h>
 
+/*
+ * Used to detect acpi_disabled("ipmi")
+ */
+#include <contrib/dev/acpica/include/acpi.h>
+
+#include <dev/acpica/acpivar.h>
+
 #include <isa/isavar.h>
 
 #ifdef LOCAL_MODULE
@@ -78,6 +85,9 @@
 ipmi_isa_probe(device_t dev)
 {
 
+        if (!acpi_disabled("ipmi"))
+                return(ENXIO);
+
        /* Skip any PNP devices. */
        if (isa_get_logicalid(dev) != 0)
                return (ENXIO);
--- //depot/yahoo/ybsd_9/src/sys/dev/ipmi/ipmi_isa.c    2011-11-02 23:46:55.000000000 0000
+++ /home/seanbru/ybsd_9/src/sys/dev/ipmi/ipmi_isa.c    2011-11-02 23:46:55.000000000 0000
@@ -40,6 +40,13 @@
 #include <machine/pci_cfgreg.h>
 #include <dev/pci/pcireg.h>
 
+/*
+ * Used to detect acpi_disabled("ipmi")
+ */
+#include <contrib/dev/acpica/include/acpi.h>
+
+#include <dev/acpica/acpivar.h>
+
 #include <isa/isavar.h>
 
 #ifdef LOCAL_MODULE
@@ -78,6 +85,9 @@
 ipmi_isa_probe(device_t dev)
 {
 
+        if (!acpi_disabled("ipmi"))
+                return(ENXIO);
+
        /* Skip any PNP devices. */
        if (isa_get_logicalid(dev) != 0)
                return (ENXIO);