diff options
| -rw-r--r-- | sys/amd64/acpica/OsdEnvironment.c | 6 | ||||
| -rw-r--r-- | sys/amd64/acpica/acpi_machdep.c | 6 | ||||
| -rw-r--r-- | sys/i386/acpica/OsdEnvironment.c | 6 | ||||
| -rw-r--r-- | sys/i386/acpica/acpi_machdep.c | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sys/amd64/acpica/OsdEnvironment.c b/sys/amd64/acpica/OsdEnvironment.c index 773bbe8..4e3ae44 100644 --- a/sys/amd64/acpica/OsdEnvironment.c +++ b/sys/amd64/acpica/OsdEnvironment.c @@ -38,12 +38,6 @@ ACPI_STATUS AcpiOsInitialize(void) { - /* - * Prevent the PnP BIOS code from interfering with our own scan of - * ISA devices. - */ - PnPBIOStable = NULL; - return(0); } diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c index 76e2e92..f6771e5 100644 --- a/sys/amd64/acpica/acpi_machdep.c +++ b/sys/amd64/acpica/acpi_machdep.c @@ -326,6 +326,12 @@ acpi_machdep_init(device_t dev) return (ENXIO); } + /* + * 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/acpica/OsdEnvironment.c b/sys/i386/acpica/OsdEnvironment.c index 773bbe8..4e3ae44 100644 --- a/sys/i386/acpica/OsdEnvironment.c +++ b/sys/i386/acpica/OsdEnvironment.c @@ -38,12 +38,6 @@ ACPI_STATUS AcpiOsInitialize(void) { - /* - * Prevent the PnP BIOS code from interfering with our own scan of - * ISA devices. - */ - PnPBIOStable = NULL; - return(0); } diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c index 76e2e92..f6771e5 100644 --- a/sys/i386/acpica/acpi_machdep.c +++ b/sys/i386/acpica/acpi_machdep.c @@ -326,6 +326,12 @@ acpi_machdep_init(device_t dev) return (ENXIO); } + /* + * 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); |
