Two prototypes for acpi_maptable; merge to one place

diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index d616ce3..33e5b1d 100644 (file)
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.326 2017/03/27 20:27:38 deraadt Exp $ */
+/* $OpenBSD: acpi.c,v 1.327 2017/04/08 01:20:10 deraadt Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -91,9 +91,6 @@ int   _acpi_matchhids(const char *, const char *[]);
 int    acpi_inidev(struct aml_node *, void *);
 int    acpi_foundprt(struct aml_node *, void *);
 
-struct acpi_q *acpi_maptable(struct acpi_softc *, paddr_t, const char *,
-           const char *, const char *, int);
-
 int    acpi_enable(struct acpi_softc *);
 void   acpi_init_states(struct acpi_softc *);
 

diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h
index 77e2027..4f97352 100644 (file)
--- a/sys/dev/acpi/acpivar.h
+++ b/sys/dev/acpi/acpivar.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: acpivar.h,v 1.86 2017/03/12 21:30:44 jcs Exp $        */
+/*     $OpenBSD: acpivar.h,v 1.87 2017/04/08 01:20:10 deraadt Exp $    */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  *
@@ -374,6 +374,9 @@ void        acpi_pciroots_attach(struct device *, void *, cfprint_t);
 void   *acpi_intr_establish(int, int, int, int (*)(void *), void *,
            const char *);
 
+struct acpi_q *acpi_maptable(struct acpi_softc *sc, paddr_t,
+           const char *, const char *, const char *, int);
+
 #endif
 
 #endif /* !_ACPI_WAKECODE */

diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c
index 02a3e15..b420c06 100644 (file)
--- a/sys/dev/acpi/dsdt.c
+++ b/sys/dev/acpi/dsdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsdt.c,v 1.231 2017/02/16 18:02:22 jcs Exp $ */
+/* $OpenBSD: dsdt.c,v 1.232 2017/04/08 01:20:10 deraadt Exp $ */
 /*
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
  *
@@ -46,9 +46,6 @@
 #define AML_INTSTRLEN          16
 #define AML_NAMESEG_LEN                4
 
-struct acpi_q          *acpi_maptable(struct acpi_softc *sc, paddr_t,
-                           const char *, const char *,
-                           const char *, int);
 struct aml_scope       *aml_load(struct acpi_softc *, struct aml_scope *,
                            struct aml_value *, struct aml_value *);