3 files changed, 1 insertions, 42 deletions
diff --git a/sys/boot/i386/libi386/biosacpi.c b/sys/boot/i386/libi386/biosacpi.c
index e9e2436..f511eb7 100644
--- a/sys/boot/i386/libi386/biosacpi.c
+++ b/sys/boot/i386/libi386/biosacpi.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include "actbl.h"
 
 /*
- * Detect ACPI and export information about the APCI BIOS into the
+ * Detect ACPI and export information about the ACPI BIOS into the
  * environment.
  */
 
@@ -56,8 +56,6 @@ biosacpi_detect(void)
     char		buf[24];
     int			revision;
 
-    /* XXX check the BIOS datestamp */
-
     /* locate and validate the RSDP */
     if ((rsdp = biosacpi_find_rsdp()) == NULL)
 	return;
@@ -82,9 +80,6 @@ biosacpi_detect(void)
 	sprintf(buf, "%d", rsdp->Length);
 	setenv("hint.acpi.0.xsdt_length", buf, 1);
     }
-    /* XXX other tables? */
-
-    setenv("acpi_load", "YES", 1);
 }
 
 /*
diff --git a/sys/boot/i386/libi386/i386_module.c b/sys/boot/i386/libi386/i386_module.c
index 91993df..4ddf5b2 100644
--- a/sys/boot/i386/libi386/i386_module.c
+++ b/sys/boot/i386/libi386/i386_module.c
@@ -44,25 +44,7 @@ __FBSDID("$FreeBSD$");
 int
 i386_autoload(void)
 {
-    int		error;
-    int		disabled;
-    char	*rv;
 
     /* XXX use PnP to locate stuff here */
-
-    /* autoload ACPI support */
-    /* XXX should be in 4th keyed off acpi_load */
-    disabled = 0;
-    rv = getenv("hint.acpi.0.disabled");
-    if (rv != NULL && strncmp(rv, "0", 1) != 0) {
-	disabled = 1;
-    }
-
-    if (getenv("acpi_load") && (!disabled)) {
-	error = mod_load("acpi", NULL, 0, NULL);
-	if (error != 0)
-	    printf("ACPI autoload failed - %s\n", strerror(error));
-    }
-
     return(0);
 }
diff --git a/sys/boot/i386/loader/help.i386 b/sys/boot/i386/loader/help.i386
index 6928c8e..dc28534 100644
--- a/sys/boot/i386/loader/help.i386
+++ b/sys/boot/i386/loader/help.i386
@@ -1,22 +1,4 @@
 ################################################################################
-# TACPI DControl ACPI module behaviour
-
-	$acpi_load
-
-	If set, the ACPI module will be loaded.  Clear it with
-
-	unset acpi_load
-
-	$hint.acpi.0.disabled="1"
-
-	If set, the ACPI module won't be loaded.
-
-	Note that the ACPI autodetection sets a number of hints to
-	pass information to the ACPI module.  These should not be 
-	overridden, or system behaviour will be undefined.
-
-
-################################################################################
 # Treboot DReboot the system
 
 	reboot