summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/acpi/acpi.c11
-rw-r--r--sys/dev/acpi/acpivar.h3
2 files changed, 2 insertions, 12 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 5878f29104f..4e8ce7a99f8 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.177 2010/07/18 19:49:35 mlarkin Exp $ */
+/* $OpenBSD: acpi.c,v 1.178 2010/07/19 16:40:14 deraadt Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -165,15 +165,6 @@ int acpi_evindex;
#define pch(x) (((x)>=' ' && (x)<='z') ? (x) : ' ')
-#if 0
-void
-acpi_delay(struct acpi_softc *sc, int64_t uSecs)
-{
- /* XXX this needs to become a tsleep later */
- delay(uSecs);
-}
-#endif
-
int
acpi_gasio(struct acpi_softc *sc, int iodir, int iospace, uint64_t address,
int access_size, int len, void *buffer)
diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h
index fb0db0eaf9d..6f7a4a87eea 100644
--- a/sys/dev/acpi/acpivar.h
+++ b/sys/dev/acpi/acpivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpivar.h,v 1.59 2010/07/13 21:01:05 deraadt Exp $ */
+/* $OpenBSD: acpivar.h,v 1.60 2010/07/19 16:40:14 deraadt Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
*
@@ -303,7 +303,6 @@ void acpi_sleep_walk(struct acpi_softc *, int);
#define ACPI_IOREAD 0
#define ACPI_IOWRITE 1
-void acpi_delay(struct acpi_softc *, int64_t);
void acpi_wakeup(void *);
int acpi_gasio(struct acpi_softc *, int, int, uint64_t, int, int, void *);