[src/trunk]: src/sys/dev/sun make this compile again.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fd5271f09d09
branches:  trunk
changeset: 779100:fd5271f09d09
user:      christos <christos%NetBSD.org@localhost>
date:      Wed May 02 14:54:26 2012 +0000

description:
make this compile again.

diffstat:

 sys/dev/sun/kbd.c |  33 +++++++++++++++------------------
 1 files changed, 15 insertions(+), 18 deletions(-)

diffs (73 lines):

diff -r a2b57bb110fb -r fd5271f09d09 sys/dev/sun/kbd.c
--- a/sys/dev/sun/kbd.c Wed May 02 14:36:07 2012 +0000
+++ b/sys/dev/sun/kbd.c Wed May 02 14:54:26 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kbd.c,v 1.65 2012/04/27 09:30:13 martin Exp $  */
+/*     $NetBSD: kbd.c,v 1.66 2012/05/02 14:54:26 christos Exp $        */
 
 /*
  * Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.65 2012/04/27 09:30:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.66 2012/05/02 14:54:26 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -154,10 +154,6 @@
 /* firm events input */
 static void    kbd_input_event(struct kbd_softc *, int);
 
-#if NSYSMON_ENVSYS
-static void    kbd_powerbutton(void *);
-#endif
-
 /****************************************************************
  *  Entry points for /dev/kbd
  *  (open,close,read,write,...)
@@ -901,6 +897,17 @@
 }
 
 #if NWSKBD > 0
+
+#if NSYSMON_ENVSYS
+static void
+kbd_powerbutton(void *cookie)
+{
+       struct kbd_softc *k = cookie;
+
+       sysmon_pswitch_event(&k->k_sm_pbutton, k->k_ev);
+}
+#endif
+
 static void
 kbd_input_wskbd(struct kbd_softc *k, int code)
 {
@@ -935,7 +942,8 @@
                                        k->k_ev = KEY_UP(code) ?
                                            PSWITCH_EVENT_RELEASED :
                                            PSWITCH_EVENT_PRESSED;
-                                       sysmon_task_queue_sched(0, kbd_powerbutton, k);
+                                       sysmon_task_queue_sched(0,
+                                           kbd_powerbutton, k);
 #endif
                                return;
                }
@@ -1091,15 +1099,4 @@
        }
        config_interrupts(k->k_dev, kbd_enable);
 }
-
-#if NSYSMON_ENVSYS
-static void
-kbd_powerbutton(void *cookie)
-{
-       struct kbd_softc *k = cookie;
-
-       sysmon_pswitch_event(&k->k_sm_pbutton, k->k_ev);
-}
 #endif
-
-#endif