diff options
| author | dyoung <dyoung@NetBSD.org> | 2010-03-29 16:35:59 +0000 |
|---|---|---|
| committer | dyoung <dyoung@NetBSD.org> | 2010-03-29 16:35:59 +0000 |
| commit | 0841103645caede703a8fb0af6a2ef3fdb153211 (patch) | |
| tree | d0834c0160acdf2f6854ebbff83ecc9f06a94acf /sys/dev | |
| parent | dd38ae84c7fbed8de192b12694fa169a22710c2b (diff) | |
Attach acpiecdt with acpibus_attach_args. Sverre Froyen reports that
this helps his Thinkpad boot again.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 8 | ||||
| -rw-r--r-- | sys/dev/acpi/acpi_ec.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index e150c2298d7..66a14734601 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi.c,v 1.162 2010/03/22 11:13:23 jruoho Exp $ */ +/* $NetBSD: acpi.c,v 1.163 2010/03/29 16:35:59 dyoung Exp $ */ /*- * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.162 2010/03/22 11:13:23 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.163 2010/03/29 16:35:59 dyoung Exp $"); #include "opt_acpi.h" #include "opt_pcifixup.h" @@ -508,7 +508,7 @@ acpi_attach(device_t parent, device_t self, void *aux) } /* Early EC handler initialization if ECDT table is available. */ - config_found_ia(self, "acpiecdtbus", NULL, NULL); + config_found_ia(self, "acpiecdtbus", aa, NULL); rv = AcpiInitializeObjects(ACPI_FULL_INITIALIZATION); if (ACPI_FAILURE(rv)) { @@ -611,7 +611,7 @@ acpi_detach(device_t self, int flags) } /* Early EC handler initialization if ECDT table is available. */ - config_found_ia(self, "acpiecdtbus", NULL, NULL); + config_found_ia(self, "acpiecdtbus", aa, NULL); rv = AcpiInitializeObjects(ACPI_FULL_INITIALIZATION); if (ACPI_FAILURE(rv)) { diff --git a/sys/dev/acpi/acpi_ec.c b/sys/dev/acpi/acpi_ec.c index ef89ee2d2ae..989c35cd023 100644 --- a/sys/dev/acpi/acpi_ec.c +++ b/sys/dev/acpi/acpi_ec.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_ec.c,v 1.63 2010/03/24 01:13:30 dyoung Exp $ */ +/* $NetBSD: acpi_ec.c,v 1.64 2010/03/29 16:35:59 dyoung Exp $ */ /*- * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.63 2010/03/24 01:13:30 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.64 2010/03/29 16:35:59 dyoung Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -226,7 +226,7 @@ acpiecdt_match(device_t parent, cfdata_t match, void *aux) static void acpiecdt_attach(device_t parent, device_t self, void *aux) { - struct acpi_attach_args *aa = aux; + struct acpibus_attach_args *aa = aux; ACPI_HANDLE ec_handle; bus_addr_t cmd_reg, data_reg; uint8_t gpebit; |
