diff options
| author |   bluhm <bluhm@openbsd.org> | 2013-05-31 22:43:43 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2013-05-31 22:43:43 +0000 |
| commit | adc9b9ae1c2fc5d1a3173e29720f73c8f8fca36f (patch) | |
| tree | 49e8a34f50434f447664324bf8812bb32bbd86df /sys/dev/acpi/acpi.c | |
| parent | More cleanup: Consistently use the name "struct tbl_node *tbl" (diff) | |
| download | wireguard-openbsd-adc9b9ae1c2fc5d1a3173e29720f73c8f8fca36f.tar.xz wireguard-openbsd-adc9b9ae1c2fc5d1a3173e29720f73c8f8fca36f.zip | |
Fix the build for a kernel without wd and pciide in its config.
OK deraadt@ tedu@
Diffstat (limited to 'sys/dev/acpi/acpi.c')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 8a43fb85352..7192f3df33e 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.244 2013/05/30 16:15:01 deraadt Exp $ */ +/* $OpenBSD: acpi.c,v 1.245 2013/05/31 22:43:43 bluhm Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -60,6 +60,7 @@ #define APMDEV_NORMAL 0 #define APMDEV_CTL 8 +#include "wd.h" #include "wsdisplay.h" #ifdef ACPI_DEBUG @@ -854,8 +855,10 @@ acpi_attach(struct device *parent, struct device *self, void *aux) /* attach battery, power supply and button devices */ aml_find_node(&aml_root, "_HID", acpi_foundhid, sc); +#if NWD > 0 /* Attach IDE bay */ aml_walknodes(&aml_root, AML_WALK_PRE, acpi_foundide, sc); +#endif /* attach docks */ aml_find_node(&aml_root, "_DCK", acpi_founddock, sc); @@ -1361,6 +1364,7 @@ is_ejectable_bay(struct aml_node *node) return ((is_ata(node) || is_ata(node->parent)) && is_ejectable(node)); } +#if NWD > 0 int acpiide_notify(struct aml_node *node, int ntype, void *arg) { @@ -1447,6 +1451,7 @@ acpi_foundide(struct aml_node *node, void *arg) aml_register_notify(node, "acpiide", acpiide_notify, ide, 0); return (0); } +#endif /* NWD > 0 */ void acpi_reset(void) |