diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index 65f79da07d2..5109e4d8a1d 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -59,7 +59,8 @@ __FBSDID("$FreeBSD$");
 
 /* exported lookup results */
 struct bios32_SDentry		PCIbios;
-struct PnPBIOS_table		*PnPBIOStable;
+
+static struct PnPBIOS_table	*PnPBIOStable;
 
 static u_int			bios32_SDCI;
 
@@ -555,7 +556,7 @@ pnpbios_identify(driver_t *driver, device_t parent)
 	return;
 
     /* ACPI already active */
-    if (devclass_get_softc(devclass_find("ACPI"), 0) != NULL)
+    if (devclass_get_softc(devclass_find("acpi"), 0) != NULL)
 	return;
 
     /* get count of PnP devices */
diff --git a/sys/amd64/include/pc/bios.h b/sys/amd64/include/pc/bios.h
index b8d3991301b..c7362a96408 100644
--- a/sys/amd64/include/pc/bios.h
+++ b/sys/amd64/include/pc/bios.h
@@ -93,7 +93,6 @@ struct PnPBIOS_table
  * Exported lookup results 
  */
 extern struct bios32_SDentry	PCIbios;
-extern struct PnPBIOS_table	*PnPBIOStable;
 
 struct segment_info {
 	u_int	base;
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index 90720b20680..79ba3cf0808 100644
--- a/sys/i386/acpica/acpi_machdep.c
+++ b/sys/i386/acpica/acpi_machdep.c
@@ -306,12 +306,6 @@ acpi_machdep_init(device_t dev)
 	acpi_dev = dev;
 	sc = device_get_softc(acpi_dev);
 
-	/*
-	 * XXX: Prevent the PnP BIOS code from interfering with
-	 * our own scan of ISA devices.
-	 */
-	PnPBIOStable = NULL;
-
 	acpi_capm_init(sc);
 
 	acpi_install_wakeup_handler(sc);
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 65f79da07d2..5109e4d8a1d 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -59,7 +59,8 @@ __FBSDID("$FreeBSD$");
 
 /* exported lookup results */
 struct bios32_SDentry		PCIbios;
-struct PnPBIOS_table		*PnPBIOStable;
+
+static struct PnPBIOS_table	*PnPBIOStable;
 
 static u_int			bios32_SDCI;
 
@@ -555,7 +556,7 @@ pnpbios_identify(driver_t *driver, device_t parent)
 	return;
 
     /* ACPI already active */
-    if (devclass_get_softc(devclass_find("ACPI"), 0) != NULL)
+    if (devclass_get_softc(devclass_find("acpi"), 0) != NULL)
 	return;
 
     /* get count of PnP devices */
diff --git a/sys/i386/include/pc/bios.h b/sys/i386/include/pc/bios.h
index b8d3991301b..c7362a96408 100644
--- a/sys/i386/include/pc/bios.h
+++ b/sys/i386/include/pc/bios.h
@@ -93,7 +93,6 @@ struct PnPBIOS_table
  * Exported lookup results 
  */
 extern struct bios32_SDentry	PCIbios;
-extern struct PnPBIOS_table	*PnPBIOStable;
 
 struct segment_info {
 	u_int	base;