2 files changed, 9 insertions, 5 deletions

diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 071546305752..3c313d87285f 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -64,6 +64,9 @@ typedef struct genkbd_softc {
 	unsigned int	gkb_q_length;
 } genkbd_softc_t;
 
+static u_char	*genkbd_get_fkeystr(keyboard_t *kbd, int fkey, size_t *len);
+static void	genkbd_diag(keyboard_t *kbd, int level);
+
 static	SLIST_HEAD(, keyboard_driver) keyboard_drivers =
 	SLIST_HEAD_INITIALIZER(keyboard_drivers);
 
@@ -176,6 +179,10 @@ kbd_add_driver(keyboard_driver_t *driver)
 {
 	if (SLIST_NEXT(driver, link))
 		return (EINVAL);
+	if (driver->kbdsw->get_fkeystr == NULL)
+		driver->kbdsw->get_fkeystr = genkbd_get_fkeystr;
+	if (driver->kbdsw->diag == NULL)
+		driver->kbdsw->diag = genkbd_diag;
 	SLIST_INSERT_HEAD(&keyboard_drivers, driver, link);
 	return (0);
 }
@@ -1121,7 +1128,7 @@ fkey_change_ok(fkeytab_t *oldkey, fkeyarg_t *newkey, struct thread *td)
 #endif
 
 /* get a pointer to the string associated with the given function key */
-u_char *
+static u_char *
 genkbd_get_fkeystr(keyboard_t *kbd, int fkey, size_t *len)
 {
 	if (kbd == NULL)
@@ -1154,7 +1161,7 @@ get_kbd_type_name(int type)
 	return ("unknown");
 }
 
-void
+static void
 genkbd_diag(keyboard_t *kbd, int level)
 {
 	if (level > 0) {
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 2207ac5294cf..80486cf3e640 100644
--- a/sys/dev/kbd/kbdreg.h
+++ b/sys/dev/kbd/kbdreg.h
@@ -392,9 +392,6 @@ int			kbd_detach(keyboard_t *kbd);
 #define LED_MASK	(LED_CAP | LED_NUM | LED_SCR)
 */
 
-kbd_get_fkeystr_t	genkbd_get_fkeystr;
-kbd_diag_t		genkbd_diag;
-
 int 	genkbd_commonioctl(keyboard_t *kbd, u_long cmd, caddr_t arg);
 int 	genkbd_keyaction(keyboard_t *kbd, int keycode, int up,
 			 int *shiftstate, int *accents);