diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-03-13 01:50:50 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-03-13 01:50:50 +0000 |
| commit | 806ea76be03bd35e48bb46b59bb85c0653420949 (patch) | |
| tree | c1c371804d75d7becf45a217f95a7981274e7576 /sys/dev/acpi | |
| parent | aede8ba3da0cbcc883f8ffd9a9b88577271bf400 (diff) | |
allow ramdisks to build; ok jcs
Diffstat (limited to 'sys/dev/acpi')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 2ff280e4bb1..1a26b08f893 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.324 2017/03/12 21:30:44 jcs Exp $ */ +/* $OpenBSD: acpi.c,v 1.325 2017/03/13 01:50:49 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -116,7 +116,6 @@ void acpi_enable_wakegpes(struct acpi_softc *, int); int acpi_foundec(struct aml_node *, void *); int acpi_foundsony(struct aml_node *node, void *arg); int acpi_foundhid(struct aml_node *, void *); -int acpi_foundsbs(struct aml_node *node, void *); int acpi_add_device(struct aml_node *node, void *arg); void acpi_thread(void *); @@ -136,6 +135,7 @@ int acpi_foundpss(struct aml_node *, void *); int acpi_foundtmp(struct aml_node *, void *); int acpi_foundprw(struct aml_node *, void *); int acpi_foundvideo(struct aml_node *, void *); +int acpi_foundsbs(struct aml_node *node, void *); int acpi_foundide(struct aml_node *node, void *arg); int acpiide_notify(struct aml_node *, int, void *); @@ -1083,8 +1083,10 @@ acpi_attach(struct device *parent, struct device *self, void *aux) aml_walknodes(&aml_root, AML_WALK_PRE, acpi_add_device, sc); +#ifndef SMALL_KERNEL /* try to find smart battery first */ aml_find_node(&aml_root, "_HID", acpi_foundsbs, sc); +#endif /* SMALL_KERNEL */ /* attach battery, power supply and button devices */ aml_find_node(&aml_root, "_HID", acpi_foundhid, sc); |