Add option WSKBD_NO_INTL_LAYOUTS to prevent inclusion of international

keyboard layouts, instead of having SMALL_KERNEL imply this on alpha.
No functional change.

ok deraadt@

1 files changed, 6 insertions, 6 deletions

diff --git a/sys/dev/usb/ukbdmap.c b/sys/dev/usb/ukbdmap.c
index 78064e79dfe..c5f3ff91d6f 100644
--- a/sys/dev/usb/ukbdmap.c
+++ b/sys/dev/usb/ukbdmap.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: ukbdmap.c,v 1.27 2007/06/17 07:53:11 mbalmer Exp $	*/
+/*	$OpenBSD: ukbdmap.c,v 1.28 2008/03/21 17:10:46 miod Exp $	*/
 
 /*
  * THIS FILE IS AUTOMAGICALLY GENERATED.  DO NOT EDIT.
  *
  * generated by:
- *	OpenBSD: makemap.awk,v 1.6 2005/05/23 21:33:03 miod Exp 
+ *	OpenBSD: makemap.awk,v 1.7 2007/06/17 07:53:11 mbalmer Exp 
  * generated from:
  */
 /*	OpenBSD: wskbdmap_mfii.c,v 1.34 2006/12/05 21:27:07 otto Exp  */
@@ -171,7 +171,7 @@ static const keysym_t ukbd_keydesc_us[] = {
     KC(231),	KS_Meta_R,
 };
 
-#if !defined(SMALL_KERNEL) || !defined(__alpha__)
+#if !defined(WSKBD_NO_INTL_LAYOUTS)
 
 static const keysym_t ukbd_keydesc_de[] = {
 /*  pos      normal		shifted		altgr		shift-altgr */
@@ -1013,14 +1013,14 @@ static const keysym_t ukbd_keydesc_nl_nodead[] = {
     KC(52),	KS_apostrophe,	KS_grave,
 };
 
-#endif	/* SMALL_KERNEL */
+#endif	/* WSKBD_NO_INTL_LAYOUTS */
 
 #define KBD_MAP(name, base, map) \
 			{ name, base, sizeof(map)/sizeof(keysym_t), map }
 
 const struct wscons_keydesc ukbd_keydesctab[] = {
 	KBD_MAP(KB_US,			0,	ukbd_keydesc_us),
-#if !defined(SMALL_KERNEL) || !defined(__alpha__)
+#if !defined(WSKBD_NO_INTL_LAYOUTS)
 	KBD_MAP(KB_DE,			KB_US,	ukbd_keydesc_de),
 	KBD_MAP(KB_DE | KB_NODEAD,	KB_DE,	ukbd_keydesc_de_nodead),
 	KBD_MAP(KB_FR,			KB_US,	ukbd_keydesc_fr),
@@ -1069,7 +1069,7 @@ const struct wscons_keydesc ukbd_keydesctab[] = {
 	KBD_MAP(KB_LV,			KB_US,	ukbd_keydesc_lv),
 	KBD_MAP(KB_NL,			KB_US, 	ukbd_keydesc_nl),
 	KBD_MAP(KB_NL | KB_NODEAD,	KB_NL,	ukbd_keydesc_nl_nodead),
-#endif	/* SMALL_KERNEL */
+#endif	/* WSKBD_NO_INTL_LAYOUTS */
 	{0, 0, 0, 0}
 };