diff options
| author | eadler <eadler@FreeBSD.org> | 2012-10-22 13:06:09 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2012-10-22 13:06:09 +0000 |
| commit | 92f340b6e7dc02801983812c792c7d3964d31ef7 (patch) | |
| tree | 07e19b18864f030899e170c445daf41bd547c6d1 /sys/dev/acpica/acpi.c | |
| parent | a9d460420e5a6206b25b2ffac4bcaa0d37cc837a (diff) | |
| download | FreeBSD-src-92f340b6e7dc02801983812c792c7d3964d31ef7.zip FreeBSD-src-92f340b6e7dc02801983812c792c7d3964d31ef7.tar.gz | |
This isn't functionally identical. In some cases a hint to disable
unit 0 would in fact disable all units.
This reverts r241856
Approved by: cperciva (implicit)
Diffstat (limited to 'sys/dev/acpica/acpi.c')
| -rw-r--r-- | sys/dev/acpica/acpi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 5e0466d0..cfe08ed 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -377,6 +377,10 @@ acpi_identify(void) if (!cold) return (ENXIO); + /* Check that we haven't been disabled with a hint. */ + if (resource_disabled("acpi", 0)) + return (ENXIO); + /* Check for other PM systems. */ if (power_pm_get_type() != POWER_PM_TYPE_NONE && power_pm_get_type() != POWER_PM_TYPE_ACPI) { |
