diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-05-14 13:07:12 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-05-14 13:07:12 +0000 |
| commit | b857c663aeebfdf6245335135509ac3cbc5a0586 (patch) | |
| tree | 4506c4f982fc2d6160abe0012d23c46b749e5c66 /sys/dev | |
| parent | 1ac42c8d743e72edb2e40a7837467f7bbba89d3a (diff) | |
Bring back the acpi(4) changes. This time around only use the ACPI _CRS
information on ACPI 5.0 and later.
ok krw@, patrick@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 3 | ||||
| -rw-r--r-- | sys/dev/acpi/acpivar.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 6f8b582d1aa..bc7130561ff 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.384 2020/05/11 17:57:17 jca Exp $ */ +/* $OpenBSD: acpi.c,v 1.385 2020/05/14 13:07:10 kettenis Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -72,6 +72,7 @@ int acpi_debug = 16; int acpi_poll_enabled; int acpi_hasprocfvs; +int acpi_haspci; #define ACPIEN_RETRIES 15 diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h index 6fac33f00ed..159b8e7b948 100644 --- a/sys/dev/acpi/acpivar.h +++ b/sys/dev/acpi/acpivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: acpivar.h,v 1.108 2020/05/08 11:18:01 kettenis Exp $ */ +/* $OpenBSD: acpivar.h,v 1.109 2020/05/14 13:07:10 kettenis Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -43,6 +43,7 @@ extern int acpi_debug; #endif extern int acpi_hasprocfvs; +extern int acpi_haspci; struct klist; struct acpiec_softc; |