diff options
| author |   kettenis <kettenis@openbsd.org> | 2017-07-20 18:34:24 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2017-07-20 18:34:24 +0000 |
| commit | e458e3046deca461f790b32729a8b01e7a67258b (patch) | |
| tree | fae9d15f989662c5b04e8eeafa3d042583be4f21 /sys/dev | |
| parent | Accessing a mmap(2)ed file behind its end should result in a SIGBUS (diff) | |
| download | wireguard-openbsd-e458e3046deca461f790b32729a8b01e7a67258b.tar.xz wireguard-openbsd-e458e3046deca461f790b32729a8b01e7a67258b.zip | |
Start a list of isa(4) device names such that we can avoid printing them
as "not configured".
ok mikeb@, millert@, deraadt@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 09495657aad..83049a2ab43 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.328 2017/04/08 04:06:01 deraadt Exp $ */ +/* $OpenBSD: acpi.c,v 1.329 2017/07/20 18:34:24 kettenis Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -2799,6 +2799,12 @@ const char *acpi_skip_hids[] = { NULL }; +/* ISA devices for which we attach a driver later */ +const char *acpi_isa_hids[] = { + "PNP0501", /* 16550A-compatible COM Serial Port */ + NULL +}; + void acpi_attach_deps(struct acpi_softc *sc, struct aml_node *node) { @@ -2856,7 +2862,8 @@ acpi_foundhid(struct aml_node *node, void *arg) aaa.aaa_node = node->parent; aaa.aaa_dev = dev; - if (acpi_matchhids(&aaa, acpi_skip_hids, "none")) + if (acpi_matchhids(&aaa, acpi_skip_hids, "none") || + acpi_matchhids(&aaa, acpi_isa_hids, "none")) return (0); #ifndef SMALL_KERNEL |