diff --git a/sys/dev/acpi_support/acpi_wmi.c b/sys/dev/acpi_support/acpi_wmi.c
index 07c2d71..47a0280 100644
--- a/sys/dev/acpi_support/acpi_wmi.c
+++ b/sys/dev/acpi_support/acpi_wmi.c
@@ -139,10 +139,12 @@ static ACPI_STATUS	acpi_wmi_set_block_method(device_t dev,
 /* callbacks */
 static void		acpi_wmi_notify_handler(ACPI_HANDLE h, UINT32 notify,
 			    void *context);
+#if 0
 static ACPI_STATUS	acpi_wmi_ec_handler(UINT32 function,
 			    ACPI_PHYSICAL_ADDRESS address, UINT32 width,
 			    ACPI_INTEGER *value, void *context,
 			    void *region_context);
+#endif
 /* helpers */
 static ACPI_STATUS	acpi_wmi_read_wdg_blocks(ACPI_HANDLE h);
 static ACPI_STATUS	acpi_wmi_toggle_we_event_generation(device_t dev,
@@ -236,14 +238,19 @@ acpi_wmi_attach(device_t dev)
 	sc->wmi_dev = dev;
 	sc->wmi_handle = acpi_get_handle(dev);
 	TAILQ_INIT(&wmi_info_list);
+#if 0
 	/* XXX Only works with one EC, but nearly all systems only have one. */
 	if ((sc->ec_dev = devclass_get_device(devclass_find("acpi_ec"), 0))
 	    == NULL)
 		device_printf(dev, "cannot find EC device\n");
-	else if (ACPI_FAILURE((status = AcpiInstallNotifyHandler(sc->wmi_handle,
+
+	else
+#endif
+	if (ACPI_FAILURE((status = AcpiInstallNotifyHandler(sc->wmi_handle,
 		    ACPI_DEVICE_NOTIFY, acpi_wmi_notify_handler, sc))))
 		device_printf(sc->wmi_dev, "couldn't install notify handler - %s\n",
 		    AcpiFormatException(status));
+#if 0
 	else if (ACPI_FAILURE((status = AcpiInstallAddressSpaceHandler(
 		    sc->wmi_handle, ACPI_ADR_SPACE_EC, acpi_wmi_ec_handler,
 		    NULL, sc)))) {
@@ -251,14 +258,18 @@ acpi_wmi_attach(device_t dev)
 		    AcpiFormatException(status));
 		AcpiRemoveNotifyHandler(sc->wmi_handle, ACPI_DEVICE_NOTIFY,
 		    acpi_wmi_notify_handler);
-	} else if (ACPI_FAILURE((status = acpi_wmi_read_wdg_blocks(
+	}
+#endif
+	else if (ACPI_FAILURE((status = acpi_wmi_read_wdg_blocks(
 		    sc->wmi_handle)))) {
 		device_printf(sc->wmi_dev, "couldn't parse _WDG - %s\n",
 		    AcpiFormatException(status));
 		AcpiRemoveNotifyHandler(sc->wmi_handle, ACPI_DEVICE_NOTIFY,
 		    acpi_wmi_notify_handler);
+#if 0
 		AcpiRemoveAddressSpaceHandler(sc->wmi_handle, ACPI_ADR_SPACE_EC,
 		    acpi_wmi_ec_handler);
+#endif
 	} else {
 		sc->wmistat_dev_t = make_dev(&wmistat_cdevsw, 0, UID_ROOT,
 		    GID_WHEEL, 0644, "wmistat");
@@ -295,8 +306,10 @@ acpi_wmi_detach(device_t dev)
 	} else {
 		AcpiRemoveNotifyHandler(sc->wmi_handle, ACPI_DEVICE_NOTIFY,
 		    acpi_wmi_notify_handler);
+#if 0
 		AcpiRemoveAddressSpaceHandler(sc->wmi_handle,
 		    ACPI_ADR_SPACE_EC, acpi_wmi_ec_handler);
+#endif
 		TAILQ_FOREACH_SAFE(winfo, &wmi_info_list, wmi_list, tmp) {
 			if (winfo->event_handler)
 				acpi_wmi_toggle_we_event_generation(dev,
@@ -640,6 +653,7 @@ acpi_wmi_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context)
 	}
 }
 
+#if 0
 /*
  * Handle EC address space notifications reveived on the WDG node
  * (this mimics EcAddressSpaceHandler in acpi_ec.c)
@@ -691,7 +705,7 @@ acpi_wmi_ec_handler(UINT32 function, ACPI_PHYSICAL_ADDRESS address,
 
 	return (status);
 }
-
+#endif
 /*
  * Read GUID blocks from the _WDG node
  * into wmi_info_list.