diff --git a/sys/arch/i386/acpi/npx_acpi.c b/sys/arch/i386/acpi/npx_acpi.c
index 284b34fcf9de..abf8f42503c1 100644
--- a/sys/arch/i386/acpi/npx_acpi.c
+++ b/sys/arch/i386/acpi/npx_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: npx_acpi.c,v 1.8 2004/04/11 10:36:45 kochi Exp $ */
+/* $NetBSD: npx_acpi.c,v 1.9 2004/05/01 12:05:01 kochi Exp $ */
 
 /*
  * Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npx_acpi.c,v 1.8 2004/04/11 10:36:45 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npx_acpi.c,v 1.9 2004/05/01 12:05:01 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,8 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: npx_acpi.c,v 1.8 2004/04/11 10:36:45 kochi Exp $");
 
 #include <i386/isa/npxvar.h>
 
-int	npx_acpi_match(struct device *, struct cfdata *, void *);
-void	npx_acpi_attach(struct device *, struct device *, void *);
+static int	npx_acpi_match(struct device *, struct cfdata *, void *);
+static void	npx_acpi_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(npx_acpi, sizeof(struct npx_softc), npx_acpi_match,
     npx_acpi_attach, NULL, NULL);
@@ -64,7 +64,7 @@ static const char * const npx_acpi_ids[] = {
 /*
  * npx_acpi_match: autoconf(9) match routine
  */
-int
+static int
 npx_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -78,7 +78,7 @@ npx_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 /*
  * npx_acpi_attach: autoconf(9) attach routine
  */
-void
+static void
 npx_acpi_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct npx_softc *sc = (struct npx_softc *)self;
diff --git a/sys/arch/i386/acpi/spic_acpi.c b/sys/arch/i386/acpi/spic_acpi.c
index 8c5d9613f721..10a51394bf59 100644
--- a/sys/arch/i386/acpi/spic_acpi.c
+++ b/sys/arch/i386/acpi/spic_acpi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: spic_acpi.c,v 1.11 2004/04/11 10:36:45 kochi Exp $	*/
+/*	$NetBSD: spic_acpi.c,v 1.12 2004/05/01 12:05:01 kochi Exp $	*/
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spic_acpi.c,v 1.11 2004/04/11 10:36:45 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spic_acpi.c,v 1.12 2004/05/01 12:05:01 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,14 +66,14 @@ static const char * const spic_acpi_ids[] = {
 	NULL
 };
 
-int	spic_acpi_match(struct device *, struct cfdata *, void *);
-void	spic_acpi_attach(struct device *, struct device *, void *);
+static int	spic_acpi_match(struct device *, struct cfdata *, void *);
+static void	spic_acpi_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(spic_acpi, sizeof(struct spic_acpi_softc),
     spic_acpi_match, spic_acpi_attach, NULL, NULL);
 
 
-int
+static int
 spic_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -84,7 +84,7 @@ spic_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 	return (acpi_match_hid(aa->aa_node->ad_devinfo, spic_acpi_ids));
 }
 
-void
+static void
 spic_acpi_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct spic_acpi_softc *sc = (void *) self;
diff --git a/sys/arch/i386/acpi/vald_acpi.c b/sys/arch/i386/acpi/vald_acpi.c
index 2730acaa52fb..454ecc82c502 100644
--- a/sys/arch/i386/acpi/vald_acpi.c
+++ b/sys/arch/i386/acpi/vald_acpi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vald_acpi.c,v 1.19 2004/04/10 11:50:55 kochi Exp $	*/
+/*	$NetBSD: vald_acpi.c,v 1.20 2004/05/01 12:05:01 kochi Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.19 2004/04/10 11:50:55 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.20 2004/05/01 12:05:01 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -137,30 +137,30 @@ static const char * const vald_acpi_hids[] = {
 #define LIBRIGHT_UP	0x01
 #define LIBRIGHT_DOWN	0x02
 
-int	vald_acpi_match(struct device *, struct cfdata *, void *);
-void	vald_acpi_attach(struct device *, struct device *, void *);
+static int	vald_acpi_match(struct device *, struct cfdata *, void *);
+static void	vald_acpi_attach(struct device *, struct device *, void *);
 
-void		vald_acpi_event(void *);
+static void	vald_acpi_event(void *);
 static void	vald_acpi_notify_handler(ACPI_HANDLE, UINT32, void *);
 
 #define ACPI_NOTIFY_ValdStatusChanged	0x80
 
 
-ACPI_STATUS	vald_acpi_ghci_get(struct vald_acpi_softc *, UINT32, UINT32 *,
-    UINT32 *);
-ACPI_STATUS	vald_acpi_ghci_set(struct vald_acpi_softc *, UINT32, UINT32,
-    UINT32 *);
+static ACPI_STATUS	vald_acpi_ghci_get(struct vald_acpi_softc *, UINT32,
+    UINT32 *, UINT32 *);
+static ACPI_STATUS	vald_acpi_ghci_set(struct vald_acpi_softc *, UINT32,
+    UINT32, UINT32 *);
 
-ACPI_STATUS	vald_acpi_libright_get_bus(ACPI_HANDLE, UINT32, void *,
+static ACPI_STATUS	vald_acpi_libright_get_bus(ACPI_HANDLE, UINT32, void *,
     void **);
-void		vald_acpi_libright_get(struct vald_acpi_softc *);
-void		vald_acpi_libright_set(struct vald_acpi_softc *, int);
+static void		vald_acpi_libright_get(struct vald_acpi_softc *);
+static void		vald_acpi_libright_set(struct vald_acpi_softc *, int);
 
-void		vald_acpi_video_switch(struct vald_acpi_softc *);
-void		vald_acpi_fan_switch(struct vald_acpi_softc *);
+static void		vald_acpi_video_switch(struct vald_acpi_softc *);
+static void		vald_acpi_fan_switch(struct vald_acpi_softc *);
 
-ACPI_STATUS	vald_acpi_bcm_set(ACPI_HANDLE, UINT32);
-ACPI_STATUS	vald_acpi_dssx_set(UINT32);
+static ACPI_STATUS	vald_acpi_bcm_set(ACPI_HANDLE, UINT32);
+static ACPI_STATUS	vald_acpi_dssx_set(UINT32);
 
 CFATTACH_DECL(vald_acpi, sizeof(struct vald_acpi_softc),
     vald_acpi_match, vald_acpi_attach, NULL, NULL);
@@ -170,7 +170,7 @@ CFATTACH_DECL(vald_acpi, sizeof(struct vald_acpi_softc),
  *
  *	Autoconfiguration `match' routine.
  */
-int
+static int
 vald_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -186,7 +186,7 @@ vald_acpi_match(struct device *parent, struct cfdata *match, void *aux)
  *
  *	Autoconfiguration `attach' routine.
  */
-void
+static void
 vald_acpi_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct vald_acpi_softc *sc = (void *) self;
@@ -288,7 +288,7 @@ vald_acpi_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
  *
  *	Check hotkey event and do it, if event occur.
  */
-void
+static void
 vald_acpi_event(void *arg)
 {
 	struct vald_acpi_softc *sc = arg;
@@ -332,7 +332,7 @@ vald_acpi_event(void *arg)
  *
  *	Get value via "GHCI" Method.
  */
-ACPI_STATUS
+static ACPI_STATUS
 vald_acpi_ghci_get(struct vald_acpi_softc *sc,
     UINT32 reg, UINT32 *value, UINT32 *result)
 {
@@ -389,7 +389,7 @@ vald_acpi_ghci_get(struct vald_acpi_softc *sc,
  *
  *	Set value via "GHCI" Method.
  */
-ACPI_STATUS
+static ACPI_STATUS
 vald_acpi_ghci_set(struct vald_acpi_softc *sc,
     UINT32 reg, UINT32 value, UINT32 *result)
 {
@@ -443,7 +443,7 @@ vald_acpi_ghci_set(struct vald_acpi_softc *sc,
  *	Get LCD brightness level via "_BCL" Method,
  *	and save this handle.
  */
-ACPI_STATUS
+static ACPI_STATUS
 vald_acpi_libright_get_bus(ACPI_HANDLE handle, UINT32 level, void *context,
     void **status)
 {
@@ -500,7 +500,7 @@ vald_acpi_libright_get_bus(ACPI_HANDLE handle, UINT32 level, void *context,
  *
  *	Search node that have "_BCL" Method.
  */
-void
+static void
 vald_acpi_libright_get(struct vald_acpi_softc *sc)
 {
 	ACPI_HANDLE parent;
@@ -524,7 +524,7 @@ vald_acpi_libright_get(struct vald_acpi_softc *sc)
  *
  *	Figure up next status and set it.
  */
-void
+static void
 vald_acpi_libright_set(struct vald_acpi_softc *sc, int UpDown)
 {
 	ACPI_STATUS rv;
@@ -601,7 +601,7 @@ vald_acpi_libright_set(struct vald_acpi_softc *sc, int UpDown)
  *
  *	Get video status(LCD/CRT) and set new video status.
  */
-void
+static void
 vald_acpi_video_switch(struct vald_acpi_softc *sc)
 {
 	ACPI_STATUS	rv;
@@ -645,7 +645,7 @@ vald_acpi_video_switch(struct vald_acpi_softc *sc)
  *
  *	Set LCD brightness via "_BCM" Method.
  */
-ACPI_STATUS
+static ACPI_STATUS
 vald_acpi_bcm_set(ACPI_HANDLE handle, UINT32 bright)
 {
 	ACPI_STATUS rv;
@@ -667,7 +667,7 @@ vald_acpi_bcm_set(ACPI_HANDLE handle, UINT32 bright)
  *
  *	Set value via "\\_SB_.VALX.DSSX" Method.
  */
-ACPI_STATUS
+static ACPI_STATUS
 vald_acpi_dssx_set(UINT32 value)
 {
 	ACPI_STATUS rv;
@@ -691,7 +691,7 @@ vald_acpi_dssx_set(UINT32 value)
  *
  *	Get FAN status and set new FAN status.
  */
-void
+static void
 vald_acpi_fan_switch(struct vald_acpi_softc *sc)
 {
 	ACPI_STATUS rv;
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 235f6993466e..354b0e127708 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi.c,v 1.63 2004/04/11 06:48:25 kochi Exp $	*/
+/*	$NetBSD: acpi.c,v 1.64 2004/05/01 12:03:48 kochi Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.63 2004/04/11 06:48:25 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.64 2004/05/01 12:03:48 kochi Exp $");
 
 #include "opt_acpi.h"
 
@@ -114,10 +114,10 @@ MALLOC_DECLARE(M_ACPI);
 int	acpi_dbgr = 0x00;
 #endif
 
-int	acpi_match(struct device *, struct cfdata *, void *);
-void	acpi_attach(struct device *, struct device *, void *);
+static int	acpi_match(struct device *, struct cfdata *, void *);
+static void	acpi_attach(struct device *, struct device *, void *);
 
-int	acpi_print(void *aux, const char *);
+static int	acpi_print(void *aux, const char *);
 
 extern struct cfdriver acpi_cd;
 
@@ -146,17 +146,17 @@ static int acpi_locked;
 /*
  * Prototypes.
  */
-void		acpi_shutdown(void *);
-ACPI_STATUS	acpi_disable(struct acpi_softc *sc);
-void		acpi_build_tree(struct acpi_softc *);
-ACPI_STATUS	acpi_make_devnode(ACPI_HANDLE, UINT32, void *, void **);
+static void		acpi_shutdown(void *);
+static ACPI_STATUS	acpi_disable(struct acpi_softc *sc);
+static void		acpi_build_tree(struct acpi_softc *);
+static ACPI_STATUS	acpi_make_devnode(ACPI_HANDLE, UINT32, void *, void **);
 
-void		acpi_enable_fixed_events(struct acpi_softc *);
+static void		acpi_enable_fixed_events(struct acpi_softc *);
 #ifdef ACPI_PCI_FIXUP
-void		acpi_pci_fixup(struct acpi_softc *);
+void			acpi_pci_fixup(struct acpi_softc *);
 #endif
 #if defined(ACPI_PCI_FIXUP) || defined(ACPI_ACTIVATE_DEV)
-ACPI_STATUS	acpi_allocate_resources(ACPI_HANDLE handle);
+static ACPI_STATUS	acpi_allocate_resources(ACPI_HANDLE handle);
 #endif
 
 /*
@@ -220,7 +220,7 @@ acpi_probe(void)
  *
  *	Autoconfiguration `match' routine.
  */
-int
+static int
 acpi_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpibus_attach_args *aa = aux;
@@ -245,7 +245,7 @@ acpi_match(struct device *parent, struct cfdata *match, void *aux)
  *	which was required to check for the presence of ACPI),
  *	and enable the ACPI subsystem.
  */
-void
+static void
 acpi_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct acpi_softc *sc = (void *) self;
@@ -358,7 +358,7 @@ acpi_attach(struct device *parent, struct device *self, void *aux)
  *	Shutdown hook for ACPI -- disable some events that
  *	might confuse us.
  */
-void
+static void
 acpi_shutdown(void *arg)
 {
 	struct acpi_softc *sc = arg;
@@ -375,7 +375,7 @@ acpi_shutdown(void *arg)
  *
  *	Disable ACPI.
  */
-ACPI_STATUS
+static ACPI_STATUS
 acpi_disable(struct acpi_softc *sc)
 {
 	ACPI_STATUS rv = AE_OK;
@@ -399,7 +399,7 @@ struct acpi_make_devnode_state {
  *	Scan relevant portions of the ACPI namespace and attach
  *	child devices.
  */
-void
+static void
 acpi_build_tree(struct acpi_softc *sc)
 {
 	static const char *scopes[] = {
@@ -523,7 +523,7 @@ acpi_activate_device(ACPI_HANDLE handle, ACPI_DEVICE_INFO **di)
  *
  *	Make an ACPI devnode.
  */
-ACPI_STATUS
+static ACPI_STATUS
 acpi_make_devnode(ACPI_HANDLE handle, UINT32 level, void *context,
     void **status)
 {
@@ -610,7 +610,7 @@ acpi_make_devnode(ACPI_HANDLE handle, UINT32 level, void *context,
  *
  *	Autoconfiguration print routine.
  */
-int
+static int
 acpi_print(void *aux, const char *pnp)
 {
 	struct acpi_attach_args *aa = aux;
@@ -672,15 +672,15 @@ acpi_print(void *aux, const char *pnp)
  * ACPI fixed-hardware feature handlers
  *****************************************************************************/
 
-UINT32		acpi_fixed_button_handler(void *);
-void		acpi_fixed_button_pressed(void *);
+static UINT32	acpi_fixed_button_handler(void *);
+static void	acpi_fixed_button_pressed(void *);
 
 /*
  * acpi_enable_fixed_events:
  *
  *	Enable any fixed-hardware feature handlers.
  */
-void
+static void
 acpi_enable_fixed_events(struct acpi_softc *sc)
 {
 	static int beenhere;
@@ -741,7 +741,7 @@ acpi_enable_fixed_events(struct acpi_softc *sc)
  *
  *	Event handler for the fixed buttons.
  */
-UINT32
+static UINT32
 acpi_fixed_button_handler(void *context)
 {
 	struct sysmon_pswitch *smpsw = context;
@@ -766,7 +766,7 @@ acpi_fixed_button_handler(void *context)
  *
  *	Deal with a fixed button being pressed.
  */
-void
+static void
 acpi_fixed_button_pressed(void *context)
 {
 	struct sysmon_pswitch *smpsw = context;
@@ -1183,7 +1183,7 @@ acpi_pci_fixup_bus(ACPI_HANDLE handle, UINT32 level, void *context,
 
 #if defined(ACPI_PCI_FIXUP) || defined(ACPI_ACTIVATE_DEV)
 /* XXX This very incomplete */
-ACPI_STATUS
+static ACPI_STATUS
 acpi_allocate_resources(ACPI_HANDLE handle)
 {
 	ACPI_BUFFER bufp, bufc, bufn;
diff --git a/sys/dev/acpi/acpi_acad.c b/sys/dev/acpi/acpi_acad.c
index c10a923bc1f1..cfae4829e926 100644
--- a/sys/dev/acpi/acpi_acad.c
+++ b/sys/dev/acpi/acpi_acad.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_acad.c,v 1.14 2004/04/11 06:48:25 kochi Exp $	*/
+/*	$NetBSD: acpi_acad.c,v 1.15 2004/05/01 12:03:48 kochi Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.14 2004/04/11 06:48:25 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.15 2004/05/01 12:03:48 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -74,7 +74,7 @@ struct acpiacad_softc {
 	struct simplelock sc_lock;
 };
 
-const struct envsys_range acpiacad_range[] = {
+static const struct envsys_range acpiacad_range[] = {
 	{ 0, 2,		ENVSYS_INDICATOR },
 	{ 1, 0, 	-1},
 };
@@ -135,7 +135,7 @@ static int acpiacad_streinfo(struct sysmon_envsys *, struct envsys_basic_info *)
  *
  *	Autoconfiguration `match' routine.
  */
-int
+static int
 acpiacad_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -151,7 +151,7 @@ acpiacad_match(struct device *parent, struct cfdata *match, void *aux)
  *
  *	Autoconfiguration `attach' routine.
  */
-void
+static void
 acpiacad_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct acpiacad_softc *sc = (void *) self;
@@ -193,7 +193,7 @@ acpiacad_attach(struct device *parent, struct device *self, void *aux)
  *
  *	Get, and possibly display, the current AC line status.
  */
-void
+static void
 acpiacad_get_status(void *arg)
 {
 	struct acpiacad_softc *sc = arg;
@@ -219,7 +219,7 @@ acpiacad_get_status(void *arg)
 /*
  * Clear status
  */
-void
+static void
 acpiacad_clear_status(struct acpiacad_softc *sc)
 {
 
@@ -235,7 +235,7 @@ acpiacad_clear_status(struct acpiacad_softc *sc)
  *
  *	Callback from ACPI interrupt handler to notify us of an event.
  */
-void
+static void
 acpiacad_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
 {
 	struct acpiacad_softc *sc = context;
@@ -269,7 +269,7 @@ acpiacad_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
 	}
 }
 
-void
+static void
 acpiacad_init_envsys(struct acpiacad_softc *sc)
 {
 	int i;
@@ -305,7 +305,7 @@ acpiacad_init_envsys(struct acpiacad_softc *sc)
 		    sc->sc_dev.dv_xname);
 }
 
-int
+static int
 acpiacad_gtredata(struct sysmon_envsys *sme, struct envsys_tre_data *tred)
 {
 	struct acpiacad_softc *sc = sme->sme_cookie;
@@ -321,7 +321,7 @@ acpiacad_gtredata(struct sysmon_envsys *sme, struct envsys_tre_data *tred)
 }
 
 
-int
+static int
 acpiacad_streinfo(struct sysmon_envsys *sme, struct envsys_basic_info *binfo)
 {
 
diff --git a/sys/dev/acpi/acpi_bat.c b/sys/dev/acpi/acpi_bat.c
index 300a5ba09095..dce506487659 100644
--- a/sys/dev/acpi/acpi_bat.c
+++ b/sys/dev/acpi/acpi_bat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_bat.c,v 1.38 2004/04/12 15:09:46 kochi Exp $	*/
+/*	$NetBSD: acpi_bat.c,v 1.39 2004/05/01 12:03:48 kochi Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.38 2004/04/12 15:09:46 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.39 2004/05/01 12:03:48 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -114,14 +114,14 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.38 2004/04/12 15:09:46 kochi Exp $");
 #define ACPIBAT_DISCHARGING	12
 #define ACPIBAT_NSENSORS	13  /* number of sensors */
 
-const struct envsys_range acpibat_range_amp[] = {
+static const struct envsys_range acpibat_range_amp[] = {
 	{ 0, 1,		ENVSYS_SVOLTS_DC },
 	{ 1, 2,		ENVSYS_SAMPS },
 	{ 2, 3,		ENVSYS_SAMPHOUR },
 	{ 1, 0,		-1 },
 };
 
-const struct envsys_range acpibat_range_watt[] = {
+static const struct envsys_range acpibat_range_watt[] = {
 	{ 0, 1,		ENVSYS_SVOLTS_DC },
 	{ 1, 2,		ENVSYS_SWATTS },
 	{ 2, 3,		ENVSYS_SWATTHOUR },
@@ -213,8 +213,8 @@ do {						\
 	splx((s));				\
 } while(/*CONSTCOND*/0)
 
-int	acpibat_match(struct device *, struct cfdata *, void *);
-void	acpibat_attach(struct device *, struct device *, void *);
+static int	acpibat_match(struct device *, struct cfdata *, void *);
+static void	acpibat_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(acpibat, sizeof(struct acpibat_softc),
     acpibat_match, acpibat_attach, NULL, NULL);
@@ -239,7 +239,7 @@ static int acpibat_streinfo(struct sysmon_envsys *, struct envsys_basic_info *);
  *
  *	Autoconfiguration `match' routine.
  */
-int
+static int
 acpibat_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -255,7 +255,7 @@ acpibat_match(struct device *parent, struct cfdata *match, void *aux)
  *
  *	Autoconfiguration `attach' routine.
  */
-void
+static void
 acpibat_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct acpibat_softc *sc = (void *) self;
@@ -297,7 +297,7 @@ acpibat_attach(struct device *parent, struct device *self, void *aux)
  * clear informations
  */
 
-void
+static void
 acpibat_clear_presence(struct acpibat_softc *sc)
 {
 
@@ -308,7 +308,7 @@ acpibat_clear_presence(struct acpibat_softc *sc)
 	ABAT_CLEAR(sc, ABAT_F_PRESENT);
 }
 
-void
+static void
 acpibat_clear_info(struct acpibat_softc *sc)
 {
 
@@ -326,7 +326,7 @@ acpibat_clear_info(struct acpibat_softc *sc)
 	sc->sc_data[ACPIBAT_LCAPACITY].validflags &= ~(ENVSYS_FCURVALID | ENVSYS_FMAXVALID | ENVSYS_FFRACVALID);
 }
 
-void
+static void
 acpibat_clear_stat(struct acpibat_softc *sc)
 {
 
@@ -347,7 +347,7 @@ acpibat_clear_stat(struct acpibat_softc *sc)
 /*
  * returns 0 for no battery, 1 for present, and -1 on error
  */
-int
+static int
 acpibat_battery_present(struct acpibat_softc *sc)
 {
 	u_int32_t sta;
@@ -383,7 +383,7 @@ acpibat_battery_present(struct acpibat_softc *sc)
  * 	Get, and possibly display, the battery info.
  */
 
-ACPI_STATUS
+static ACPI_STATUS
 acpibat_get_info(struct acpibat_softc *sc)
 {
 	ACPI_OBJECT *p1, *p2;
@@ -473,7 +473,7 @@ out:
  *
  *	Get, and possibly display, the current battery line status.
  */
-ACPI_STATUS
+static ACPI_STATUS
 acpibat_get_status(struct acpibat_softc *sc)
 {
 	int flags, status, s;
@@ -657,7 +657,7 @@ acpibat_update(void *arg)
  *
  *	Callback from ACPI interrupt handler to notify us of an event.
  */
-void
+static void
 acpibat_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
 {
 	struct acpibat_softc *sc = context;
@@ -700,7 +700,7 @@ acpibat_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
 	}
 }
 
-void
+static void
 acpibat_init_envsys(struct acpibat_softc *sc)
 {
 	int capunit, rateunit;
@@ -763,7 +763,7 @@ acpibat_init_envsys(struct acpibat_softc *sc)
 		    sc->sc_dev.dv_xname);
 }
 
-int
+static int
 acpibat_gtredata(struct sysmon_envsys *sme, struct envsys_tre_data *tred)
 {
 	struct acpibat_softc *sc = sme->sme_cookie;
@@ -778,7 +778,7 @@ acpibat_gtredata(struct sysmon_envsys *sme, struct envsys_tre_data *tred)
 	return 0;
 }
 
-int
+static int
 acpibat_streinfo(struct sysmon_envsys *sme, struct envsys_basic_info *binfo)
 {
 
diff --git a/sys/dev/acpi/acpi_button.c b/sys/dev/acpi/acpi_button.c
index 7042e36a09f7..8efa96350894 100644
--- a/sys/dev/acpi/acpi_button.c
+++ b/sys/dev/acpi/acpi_button.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_button.c,v 1.15 2004/04/11 11:25:34 kochi Exp $	*/
+/*	$NetBSD: acpi_button.c,v 1.16 2004/05/01 12:03:48 kochi Exp $	*/
 
 /*
  * Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.15 2004/04/11 11:25:34 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.16 2004/05/01 12:03:48 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,21 +71,21 @@ static const char * const sleep_button_hid[] = {
 
 #define	ACPIBUT_F_VERBOSE		0x01	/* verbose events */
 
-int	acpibut_match(struct device *, struct cfdata *, void *);
-void	acpibut_attach(struct device *, struct device *, void *);
+static int	acpibut_match(struct device *, struct cfdata *, void *);
+static void	acpibut_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(acpibut, sizeof(struct acpibut_softc),
     acpibut_match, acpibut_attach, NULL, NULL);
 
-void	acpibut_pressed_event(void *);
-void	acpibut_notify_handler(ACPI_HANDLE, UINT32, void *context);
+static void	acpibut_pressed_event(void *);
+static void	acpibut_notify_handler(ACPI_HANDLE, UINT32, void *context);
 
 /*
  * acpibut_match:
  *
  *	Autoconfiguration `match' routine.
  */
-int
+static int
 acpibut_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -107,7 +107,7 @@ acpibut_match(struct device *parent, struct cfdata *match, void *aux)
  *
  *	Autoconfiguration `attach' routine.
  */
-void
+static void
 acpibut_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct acpibut_softc *sc = (void *) self;
@@ -157,7 +157,7 @@ acpibut_attach(struct device *parent, struct device *self, void *aux)
  *
  *	Deal with a button being pressed.
  */
-void
+static void
 acpibut_pressed_event(void *arg)
 {
 	struct acpibut_softc *sc = arg;
@@ -173,7 +173,7 @@ acpibut_pressed_event(void *arg)
  *
  *	Callback from ACPI interrupt handler to notify us of an event.
  */
-void
+static void
 acpibut_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
 {
 	struct acpibut_softc *sc = context;
diff --git a/sys/dev/acpi/acpi_ec.c b/sys/dev/acpi/acpi_ec.c
index f12075d83a96..29daf307939b 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.30 2004/04/24 09:07:50 yamt Exp $	*/
+/*	$NetBSD: acpi_ec.c,v 1.31 2004/05/01 12:03:48 kochi Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -172,7 +172,7 @@
  *****************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.30 2004/04/24 09:07:50 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.31 2004/05/01 12:03:48 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -268,8 +268,8 @@ static __inline void	EcLock(struct acpi_ec_softc *);
 static __inline void	EcUnlock(struct acpi_ec_softc *);
 
 
-int	acpiec_match(struct device *, struct cfdata *, void *);
-void	acpiec_attach(struct device *, struct device *, void *);
+static int	acpiec_match(struct device *, struct cfdata *, void *);
+static void	acpiec_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(acpiec, sizeof(struct acpi_ec_softc),
     acpiec_match, acpiec_attach, NULL, NULL);
@@ -353,7 +353,7 @@ EcUnlock(struct acpi_ec_softc *sc)
  *
  *	Autoconfiguration `match' routine.
  */
-int
+static int
 acpiec_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -472,7 +472,7 @@ acpiec_early_attach(struct device *parent)
  *
  *	Autoconfiguration `attach' routine.
  */
-void
+static void
 acpiec_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct acpi_ec_softc *sc = (void *) self;
diff --git a/sys/dev/acpi/acpi_lid.c b/sys/dev/acpi/acpi_lid.c
index 16c870180fdf..258830456a2a 100644
--- a/sys/dev/acpi/acpi_lid.c
+++ b/sys/dev/acpi/acpi_lid.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_lid.c,v 1.14 2004/04/11 06:48:25 kochi Exp $	*/
+/*	$NetBSD: acpi_lid.c,v 1.15 2004/05/01 12:03:48 kochi Exp $	*/
 
 /*
  * Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.14 2004/04/11 06:48:25 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.15 2004/05/01 12:03:48 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -63,21 +63,21 @@ static const char * const lid_hid[] = {
 	NULL
 };
 
-int	acpilid_match(struct device *, struct cfdata *, void *);
-void	acpilid_attach(struct device *, struct device *, void *);
+static int	acpilid_match(struct device *, struct cfdata *, void *);
+static void	acpilid_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(acpilid, sizeof(struct acpilid_softc),
     acpilid_match, acpilid_attach, NULL, NULL);
 
-void	acpilid_status_changed(void *);
-void	acpilid_notify_handler(ACPI_HANDLE, UINT32, void *context);
+static void	acpilid_status_changed(void *);
+static void	acpilid_notify_handler(ACPI_HANDLE, UINT32, void *context);
 
 /*
  * acpilid_match:
  *
  *	Autoconfiguration `match' routine.
  */
-int
+static int
 acpilid_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -93,7 +93,7 @@ acpilid_match(struct device *parent, struct cfdata *match, void *aux)
  *
  *	Autoconfiguration `attach' routine.
  */
-void
+static void
 acpilid_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct acpilid_softc *sc = (void *) self;
@@ -126,7 +126,7 @@ acpilid_attach(struct device *parent, struct device *self, void *aux)
  *
  *	Get, and possibly display, the lid status, and take action.
  */
-void
+static void
 acpilid_status_changed(void *arg)
 {
 	struct acpilid_softc *sc = arg;
@@ -146,7 +146,7 @@ acpilid_status_changed(void *arg)
  *
  *	Callback from ACPI interrupt handler to notify us of an event.
  */
-void
+static void
 acpilid_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
 {
 	struct acpilid_softc *sc = context;
diff --git a/sys/dev/acpi/acpi_madt.c b/sys/dev/acpi/acpi_madt.c
index c73191f7e0e4..bf58b6c07e26 100644
--- a/sys/dev/acpi/acpi_madt.c
+++ b/sys/dev/acpi/acpi_madt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_madt.c,v 1.12 2004/03/24 13:02:23 kochi Exp $	*/
+/*	$NetBSD: acpi_madt.c,v 1.13 2004/05/01 12:03:48 kochi Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.12 2004/03/24 13:02:23 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.13 2004/05/01 12:03:48 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -177,7 +177,7 @@ acpi_madt_walk(ACPI_STATUS (*func)(APIC_HEADER *, void *), void *aux)
 }
 
 #ifdef ACPI_MADT_DEBUG
-void
+static void
 acpi_madt_print(void)
 {
 	MULTIPLE_APIC_TABLE *ap;
diff --git a/sys/dev/acpi/acpi_tz.c b/sys/dev/acpi/acpi_tz.c
index 70d14f057757..6e8ff31665fc 100644
--- a/sys/dev/acpi/acpi_tz.c
+++ b/sys/dev/acpi/acpi_tz.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.10 2004/04/10 11:48:11 kochi Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.11 2004/05/01 12:03:48 kochi Exp $ */
 
 /*
  * Copyright (c) 2003 Jared D. McNeill <jmcneill@invisible.ca>
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.10 2004/04/10 11:48:11 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.11 2004/05/01 12:03:48 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -59,12 +59,12 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.10 2004/04/10 11:48:11 kochi Exp $");
 #define ATZ_SENSOR_TEMP	0	/* thermal zone temperature */
 #define ATZ_NUMSENSORS	1	/* number of sensors */
 
-const struct envsys_range acpitz_ranges[] = {
+static const struct envsys_range acpitz_ranges[] = {
 	{ 0, 1,	ATZ_SENSOR_TEMP },
 };
 
-int	acpitz_match(struct device *, struct cfdata *, void *);
-void	acpitz_attach(struct device *, struct device *, void *);
+static int	acpitz_match(struct device *, struct cfdata *, void *);
+static void	acpitz_attach(struct device *, struct device *, void *);
 
 /*
  * ACPI Temperature Zone information. Note all temperatures are reported
@@ -108,9 +108,9 @@ struct acpitz_softc {
 	int sc_rate;		/* tz poll rate */
 };
 
-void	acpitz_get_status(void *);
+static void	acpitz_get_status(void *);
 static void	acpitz_print_status(struct acpitz_softc *);
-void	acpitz_notify_handler(ACPI_HANDLE, UINT32, void *);
+static void	acpitz_notify_handler(ACPI_HANDLE, UINT32, void *);
 static void	acpitz_tick(void *);
 static void	acpitz_init_envsys(struct acpitz_softc *);
 static int	acpitz_gtredata(struct sysmon_envsys *,
@@ -124,7 +124,7 @@ CFATTACH_DECL(acpitz, sizeof(struct acpitz_softc), acpitz_match,
 /*
  * acpitz_match: autoconf(9) match routine
  */
-int
+static int
 acpitz_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -138,7 +138,7 @@ acpitz_match(struct device *parent, struct cfdata *match, void *aux)
 /*
  * acpitz_attach: autoconf(9) attach routine
  */
-void
+static void
 acpitz_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct acpitz_softc *sc = (struct acpitz_softc *)self;
@@ -185,7 +185,7 @@ acpitz_attach(struct device *parent, struct device *self, void *aux)
 	acpitz_init_envsys(sc);
 }
 
-void
+static void
 acpitz_get_status(void *opaque)
 {
 	struct acpitz_softc *sc = opaque;
@@ -226,7 +226,7 @@ acpitz_print_status(struct acpitz_softc *sc)
 	return;
 }
 
-void
+static void
 acpitz_notify_handler(ACPI_HANDLE hdl, UINT32 notify, void *opaque)
 {
 	struct acpitz_softc *sc = opaque;
@@ -313,7 +313,7 @@ acpitz_gtredata(struct sysmon_envsys *sme, struct envsys_tre_data *tred)
 	return 0;
 }
 
-int
+static int
 acpitz_streinfo(struct sysmon_envsys *sme, struct envsys_basic_info *binfo)
 {
 
diff --git a/sys/dev/acpi/acpica/Osd/OsdInterrupt.c b/sys/dev/acpi/acpica/Osd/OsdInterrupt.c
index 919dcddf04bb..bae7468c7217 100644
--- a/sys/dev/acpi/acpica/Osd/OsdInterrupt.c
+++ b/sys/dev/acpi/acpica/Osd/OsdInterrupt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: OsdInterrupt.c,v 1.4 2003/03/05 23:00:57 christos Exp $	*/
+/*	$NetBSD: OsdInterrupt.c,v 1.5 2004/05/01 12:03:27 kochi Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdInterrupt.c,v 1.4 2003/03/05 23:00:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdInterrupt.c,v 1.5 2004/05/01 12:03:27 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -72,9 +72,9 @@ struct acpi_interrupt_handler {
 	void *aih_ih;
 };
 
-LIST_HEAD(, acpi_interrupt_handler) acpi_interrupt_list =
+static LIST_HEAD(, acpi_interrupt_handler) acpi_interrupt_list =
     LIST_HEAD_INITIALIZER(&acpi_interrupt_list);
-struct simplelock acpi_interrupt_list_slock = SIMPLELOCK_INITIALIZER;
+static struct simplelock acpi_interrupt_list_slock = SIMPLELOCK_INITIALIZER;
 
 #define	ACPI_INTERRUPT_LIST_LOCK(s)					\
 do {									\
diff --git a/sys/dev/acpi/atppc_acpi.c b/sys/dev/acpi/atppc_acpi.c
index b635b87ba369..843b963bfb7d 100644
--- a/sys/dev/acpi/atppc_acpi.c
+++ b/sys/dev/acpi/atppc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_acpi.c,v 1.4 2004/04/11 10:36:35 kochi Exp $ */
+/* $NetBSD: atppc_acpi.c,v 1.5 2004/05/01 12:03:48 kochi Exp $ */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.4 2004/04/11 10:36:35 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.5 2004/05/01 12:03:48 kochi Exp $");
 
 #include "opt_atppc.h"
 
@@ -220,7 +220,7 @@ atppc_acpi_dma_abort(struct atppc_softc * lsc)
 }
 
 /* Allocate memory for DMA over ISA bus */
-int
+static int
 atppc_acpi_dma_malloc(struct device * dev, caddr_t * buf, bus_addr_t * bus_addr,
 	bus_size_t size)
 {
@@ -230,7 +230,7 @@ atppc_acpi_dma_malloc(struct device * dev, caddr_t * buf, bus_addr_t * bus_addr,
 }
 
 /* Free memory allocated by atppc_isa_dma_malloc() */
-void
+static void
 atppc_acpi_dma_free(struct device * dev, caddr_t * buf, bus_addr_t * bus_addr,
 	bus_size_t size)
 {
diff --git a/sys/dev/acpi/com_acpi.c b/sys/dev/acpi/com_acpi.c
index 8cfbc44109cb..364770ef4fd3 100644
--- a/sys/dev/acpi/com_acpi.c
+++ b/sys/dev/acpi/com_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_acpi.c,v 1.14 2004/04/11 10:36:35 kochi Exp $ */
+/* $NetBSD: com_acpi.c,v 1.15 2004/05/01 12:03:48 kochi Exp $ */
 
 /*
  * Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.14 2004/04/11 10:36:35 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.15 2004/05/01 12:03:48 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,8 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.14 2004/04/11 10:36:35 kochi Exp $");
 
 #include <dev/ic/comvar.h>
 
-int	com_acpi_match(struct device *, struct cfdata *, void *);
-void	com_acpi_attach(struct device *, struct device *, void *);
+static int	com_acpi_match(struct device *, struct cfdata *, void *);
+static void	com_acpi_attach(struct device *, struct device *, void *);
 
 struct com_acpi_softc {
 	struct com_softc sc_com;
@@ -76,7 +76,7 @@ static const char * const com_acpi_ids[] = {
 /*
  * com_acpi_match: autoconf(9) match routine
  */
-int
+static int
 com_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -90,7 +90,7 @@ com_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 /*
  * com_acpi_attach: autoconf(9) attach routine
  */
-void
+static void
 com_acpi_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct com_acpi_softc *asc = (struct com_acpi_softc *)self;
diff --git a/sys/dev/acpi/fdc_acpi.c b/sys/dev/acpi/fdc_acpi.c
index 9ad15c54f484..be3c11cd94ce 100644
--- a/sys/dev/acpi/fdc_acpi.c
+++ b/sys/dev/acpi/fdc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.21 2004/04/11 10:36:35 kochi Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.22 2004/05/01 12:03:48 kochi Exp $ */
 
 /*
  * Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.21 2004/04/11 10:36:35 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.22 2004/05/01 12:03:48 kochi Exp $");
 
 #include "rnd.h"
 
@@ -62,8 +62,8 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.21 2004/04/11 10:36:35 kochi Exp $");
 
 #include <dev/acpi/fdc_acpireg.h>
 
-int	fdc_acpi_match(struct device *, struct cfdata *, void *);
-void	fdc_acpi_attach(struct device *, struct device *, void *);
+static int	fdc_acpi_match(struct device *, struct cfdata *, void *);
+static void	fdc_acpi_attach(struct device *, struct device *, void *);
 
 struct fdc_acpi_softc {
 	struct fdc_softc sc_fdc;
@@ -91,7 +91,7 @@ static const char * const fdc_acpi_ids[] = {
 /*
  * fdc_acpi_match: autoconf(9) match routine
  */
-int
+static int
 fdc_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -105,7 +105,7 @@ fdc_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 /*
  * fdc_acpi_attach: autoconf(9) attach routine
  */
-void
+static void
 fdc_acpi_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct fdc_acpi_softc *asc = (struct fdc_acpi_softc *)self;
diff --git a/sys/dev/acpi/lpt_acpi.c b/sys/dev/acpi/lpt_acpi.c
index c6d00d6200f7..4451269bcd8c 100644
--- a/sys/dev/acpi/lpt_acpi.c
+++ b/sys/dev/acpi/lpt_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_acpi.c,v 1.9 2004/04/11 10:36:35 kochi Exp $ */
+/* $NetBSD: lpt_acpi.c,v 1.10 2004/05/01 12:03:48 kochi Exp $ */
 
 /*
  * Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.9 2004/04/11 10:36:35 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.10 2004/05/01 12:03:48 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,8 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.9 2004/04/11 10:36:35 kochi Exp $");
 
 #include <dev/ic/lptvar.h>
 
-int	lpt_acpi_match(struct device *, struct cfdata *, void *);
-void	lpt_acpi_attach(struct device *, struct device *, void *);
+static int	lpt_acpi_match(struct device *, struct cfdata *, void *);
+static void	lpt_acpi_attach(struct device *, struct device *, void *);
 
 struct lpt_acpi_softc {
 	struct lpt_softc sc_lpt;
@@ -70,7 +70,7 @@ static const char * const lpt_acpi_ids[] = {
 /*
  * lpt_acpi_match: autoconf(9) match routine
  */
-int
+static int
 lpt_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -84,7 +84,7 @@ lpt_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 /*
  * lpt_acpi_attach: autoconf(9) attach routine
  */
-void
+static void
 lpt_acpi_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct lpt_acpi_softc *asc = (struct lpt_acpi_softc *)self;
diff --git a/sys/dev/acpi/pckbc_acpi.c b/sys/dev/acpi/pckbc_acpi.c
index ce23ea2f81ff..c98029d5c790 100644
--- a/sys/dev/acpi/pckbc_acpi.c
+++ b/sys/dev/acpi/pckbc_acpi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pckbc_acpi.c,v 1.14 2004/04/11 10:36:35 kochi Exp $	*/
+/*	$NetBSD: pckbc_acpi.c,v 1.15 2004/05/01 12:03:48 kochi Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.14 2004/04/11 10:36:35 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.15 2004/05/01 12:03:48 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,8 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.14 2004/04/11 10:36:35 kochi Exp $"
 
 #include <dev/acpi/acpivar.h>
 
-int	pckbc_acpi_match(struct device *, struct cfdata *, void *);
-void	pckbc_acpi_attach(struct device *, struct device *, void *);
+static int	pckbc_acpi_match(struct device *, struct cfdata *, void *);
+static void	pckbc_acpi_attach(struct device *, struct device *, void *);
 
 struct pckbc_acpi_softc {
 	struct pckbc_softc sc_pckbc;
@@ -91,7 +91,7 @@ extern struct cfdriver pckbc_cd;
 CFATTACH_DECL(pckbc_acpi, sizeof(struct pckbc_acpi_softc),
     pckbc_acpi_match, pckbc_acpi_attach, NULL, NULL);
 
-void	pckbc_acpi_intr_establish(struct pckbc_softc *, pckbc_slot_t);
+static void	pckbc_acpi_intr_establish(struct pckbc_softc *, pckbc_slot_t);
 
 /*
  * Supported Device IDs
@@ -116,7 +116,7 @@ static const char * const pckbc_acpi_ids_ms[] = {
 /*
  * pckbc_acpi_match: autoconf(9) match routine
  */
-int
+static int
 pckbc_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -134,7 +134,7 @@ pckbc_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 	return 0;
 }
 
-void
+static void
 pckbc_acpi_attach(struct device *parent,
     struct device *self,
     void *aux)
@@ -234,7 +234,7 @@ pckbc_acpi_attach(struct device *parent,
 	acpi_resource_cleanup(&res);
 }
 
-void
+static void
 pckbc_acpi_intr_establish(struct pckbc_softc *sc,
     pckbc_slot_t slot)
 {
diff --git a/sys/dev/acpi/wss_acpi.c b/sys/dev/acpi/wss_acpi.c
index 6991affc44e2..7b47de1b550d 100644
--- a/sys/dev/acpi/wss_acpi.c
+++ b/sys/dev/acpi/wss_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_acpi.c,v 1.12 2004/04/11 10:36:35 kochi Exp $ */
+/* $NetBSD: wss_acpi.c,v 1.13 2004/05/01 12:03:48 kochi Exp $ */
 
 /*
  * Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.12 2004/04/11 10:36:35 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.13 2004/05/01 12:03:48 kochi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,8 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.12 2004/04/11 10:36:35 kochi Exp $");
 #include <dev/isa/wssreg.h>
 #include <dev/isa/wssvar.h>
 
-int	wss_acpi_match(struct device *, struct cfdata *, void *);
-void	wss_acpi_attach(struct device *, struct device *, void *);
+static int	wss_acpi_match(struct device *, struct cfdata *, void *);
+static void	wss_acpi_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(wss_acpi, sizeof(struct wss_softc), wss_acpi_match,
     wss_acpi_attach, NULL, NULL);
@@ -69,16 +69,16 @@ struct wss_acpi_hint {
 	int offset_ad1848;		/* offset from start of DAC region */
 };
 
-struct wss_acpi_hint wss_acpi_hints[] = {
+static struct wss_acpi_hint wss_acpi_hints[] = {
 	{ "NMX2210", 1, 2, WSS_CODEC },
 	{ "CSC0000", 0, 1, 0 },		/* Dell Latitude CPi */
 	{ "CSC0100", 0, 1, 0 },		/* CS4610 with CS4236 codec */
 	{ { 0 }, 0, 0, 0 }
 };
 
-int wss_acpi_hints_index (const char *);
+static int wss_acpi_hints_index (const char *);
 
-int
+static int
 wss_acpi_hints_index(idstr)
 	const char *idstr;
 {
@@ -96,7 +96,7 @@ wss_acpi_hints_index(idstr)
 /*
  * wss_acpi_match: autoconf(9) match routine
  */
-int
+static int
 wss_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct acpi_attach_args *aa = aux;
@@ -111,7 +111,7 @@ wss_acpi_match(struct device *parent, struct cfdata *match, void *aux)
 /*
  * wss_acpi_attach: autoconf(9) attach routine
  */
-void
+static void
 wss_acpi_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct wss_softc *sc = (struct wss_softc *)self;