diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2019-09-07 13:46:21 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2019-09-07 13:46:21 +0000 |
| commit | 8e426720d5798160e2c962ea12cdd17e9647d4d2 (patch) | |
| tree | b0b3505da3897cfecda28cbdb49e38cdd8805da9 /sys/dev/acpi | |
| parent | b862a681316b4bf7855e9a4da7c7131b9234d741 (diff) | |
Revert acpipci(4) changes. Too many systems are broken. We'll try again
after 6.6 as been released. The acpireg.h change stays behind.
Diffstat (limited to 'sys/dev/acpi')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 3 | ||||
| -rw-r--r-- | sys/dev/acpi/acpivar.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index fcded825bb5..939e1608f13 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.373 2019/08/28 22:39:09 kettenis Exp $ */ +/* $OpenBSD: acpi.c,v 1.374 2019/09/07 13:46:20 kettenis Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -71,7 +71,6 @@ 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 860362acc39..1805a2a9730 100644 --- a/sys/dev/acpi/acpivar.h +++ b/sys/dev/acpi/acpivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: acpivar.h,v 1.104 2019/08/28 22:39:09 kettenis Exp $ */ +/* $OpenBSD: acpivar.h,v 1.105 2019/09/07 13:46:20 kettenis Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -43,7 +43,6 @@ extern int acpi_debug; #endif extern int acpi_hasprocfvs; -extern int acpi_haspci; struct klist; struct acpiec_softc; |