diff options
| author | Marco Peereboom <marco@cvs.openbsd.org> | 2008-06-01 17:59:56 +0000 |
|---|---|---|
| committer | Marco Peereboom <marco@cvs.openbsd.org> | 2008-06-01 17:59:56 +0000 |
| commit | cbc33fb1757f353b753efe6c3cccbfaafd77470f (patch) | |
| tree | aeb2d3bad30ad0996583a2bc82639b90c65fa644 /sys/dev/acpi/acpibtn.c | |
| parent | 5ffc77f9703592edda7da769bf3bf4d8797c5351 (diff) | |
Re-enable new parser. Lots of testing by various folks. Fits all media
now too.
ok kettenis deraadt
Diffstat (limited to 'sys/dev/acpi/acpibtn.c')
| -rw-r--r-- | sys/dev/acpi/acpibtn.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/acpi/acpibtn.c b/sys/dev/acpi/acpibtn.c index d21b87789a0..c48c06fbd25 100644 --- a/sys/dev/acpi/acpibtn.c +++ b/sys/dev/acpi/acpibtn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpibtn.c,v 1.18 2008/05/16 06:50:55 dlg Exp $ */ +/* $OpenBSD: acpibtn.c,v 1.19 2008/06/01 17:59:55 marco Exp $ */ /* * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org> * @@ -84,7 +84,7 @@ acpibtn_attach(struct device *parent, struct device *self, void *aux) struct acpi_attach_args *aa = aux; sc->sc_acpi = (struct acpi_softc *)parent; - sc->sc_devnode = aa->aaa_node->child; + sc->sc_devnode = aa->aaa_node; if (!strcmp(aa->aaa_dev, ACPI_DEV_LD)) sc->sc_btn_type = ACPIBTN_LID; @@ -97,9 +97,9 @@ acpibtn_attach(struct device *parent, struct device *self, void *aux) acpibtn_getsta(sc); - printf(": %s\n", sc->sc_devnode->parent->name); + printf(": %s\n", sc->sc_devnode->name); - aml_register_notify(sc->sc_devnode->parent, aa->aaa_dev, acpibtn_notify, + aml_register_notify(sc->sc_devnode, aa->aaa_dev, acpibtn_notify, sc, ACPIDEV_NOPOLL); } @@ -120,7 +120,7 @@ acpibtn_notify(struct aml_node *node, int notify_type, void *arg) struct acpibtn_softc *sc = arg; dnprintf(10, "acpibtn_notify: %.2x %s\n", notify_type, - sc->sc_devnode->parent->name); + sc->sc_devnode->name); switch (sc->sc_btn_type) { case ACPIBTN_LID: |