summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2006-12-20 17:33:39 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2006-12-20 17:33:39 +0000
commit6a8ea32b55849ca9ef871833c18cb2d82434a8c7 (patch)
tree7a8b5fc0d05d77407ba2979cda9358d9983a165f
parent3fe7071bd3f80acfac22944aad3d6849d0bcba3f (diff)
oops, name already used
-rw-r--r--sys/dev/acpi/acpi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 22b364f9e32..bbae8ae99f7 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.70 2006/12/20 17:25:26 deraadt Exp $ */
+/* $OpenBSD: acpi.c,v 1.71 2006/12/20 17:33:38 deraadt Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -78,7 +78,7 @@ void acpi_foundprt(struct aml_node *, void *);
void acpi_filtdetach(struct knote *);
int acpi_filtread(struct knote *, long);
-void acpi_enable_gpe(struct acpi_softc *, int, int);
+void acpi_enable_onegpe(struct acpi_softc *, int, int);
int acpi_gpe_level(struct acpi_softc *, int, void *);
int acpi_gpe_edge(struct acpi_softc *, int, void *);
@@ -1112,7 +1112,7 @@ acpi_interrupt(void *arg)
}
void
-acpi_enable_gpe(struct acpi_softc *sc, int gpe, int enable)
+acpi_enable_onegpe(struct acpi_softc *sc, int gpe, int enable)
{
uint8_t mask = (1L << (gpe & 7));
uint8_t en;
@@ -1578,7 +1578,7 @@ acpi_isr_thread(void *arg)
/* Enable handled GPEs here */
for (gpe=0; gpe<sc->sc_lastgpe; gpe++) {
if (sc->gpe_table[gpe].handler)
- acpi_enable_gpe(sc, gpe, 1);
+ acpi_enable_onegpe(sc, gpe, 1);
}
#if 0
/* Enable EC interrupt */