From 71f12914f180c25764fbf098ada90540e35d7ff0 Mon Sep 17 00:00:00 2001 From: augustss Date: Fri, 29 Apr 2005 17:02:06 +0000 Subject: [PATCH] If UKBD_LAYOUT isn't defined, but PCKBD_LAYOUT is, use the latter as the default layout. Fixes half of kern/28668. --- sys/dev/usb/ukbd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index da5f72e92893..b51479355bfa 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $ */ +/* $NetBSD: ukbd.c,v 1.86 2005/04/29 17:02:06 augustss Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.86 2005/04/29 17:02:06 augustss Exp $"); #include #include @@ -261,8 +261,10 @@ extern const struct wscons_keydesc ukbd_keydesctab[]; const struct wskbd_mapdata ukbd_keymapdata = { ukbd_keydesctab, -#ifdef UKBD_LAYOUT +#if defined(UKBD_LAYOUT) UKBD_LAYOUT, +#elif defined(PCKBD_LAYOUT) + PCKBD_LAYOUT, #else KB_US, #endif