diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2008-03-21 17:10:47 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2008-03-21 17:10:47 +0000 |
| commit | 5063e49f849ec8b1afc7365fb5c305a6b7a1ae56 (patch) | |
| tree | f3d91f466c8cf41286a334152852a129f3957dca /sys/dev/pckbc | |
| parent | 25878968814c23048bc7e55a93aa79bae794f20c (diff) | |
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@
Diffstat (limited to 'sys/dev/pckbc')
| -rw-r--r-- | sys/dev/pckbc/wskbdmap_mfii.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pckbc/wskbdmap_mfii.c b/sys/dev/pckbc/wskbdmap_mfii.c index 7308ad7a6c5..1ab61f1b07f 100644 --- a/sys/dev/pckbc/wskbdmap_mfii.c +++ b/sys/dev/pckbc/wskbdmap_mfii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbdmap_mfii.c,v 1.34 2006/12/05 21:27:07 otto Exp $ */ +/* $OpenBSD: wskbdmap_mfii.c,v 1.35 2008/03/21 17:10:46 miod Exp $ */ /* $NetBSD: wskbdmap_mfii.c,v 1.15 2000/05/19 16:40:04 drochner Exp $ */ /* @@ -166,7 +166,7 @@ static const keysym_t pckbd_keydesc_us[] = { KC(221), KS_Menu, }; -#if !defined(SMALL_KERNEL) || !defined(__alpha__) +#if !defined(WSKBD_NO_INTL_LAYOUTS) static const keysym_t pckbd_keydesc_de[] = { /* pos normal shifted altgr shift-altgr */ @@ -977,14 +977,14 @@ static const keysym_t pckbd_keydesc_nl_nodead[] = { KC(40), 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 pckbd_keydesctab[] = { KBD_MAP(KB_US, 0, pckbd_keydesc_us), -#if !defined(SMALL_KERNEL) || !defined(__alpha__) +#if !defined(WSKBD_NO_INTL_LAYOUTS) KBD_MAP(KB_DE, KB_US, pckbd_keydesc_de), KBD_MAP(KB_DE | KB_NODEAD, KB_DE, pckbd_keydesc_de_nodead), KBD_MAP(KB_FR, KB_US, pckbd_keydesc_fr), @@ -1030,7 +1030,7 @@ const struct wscons_keydesc pckbd_keydesctab[] = { KBD_MAP(KB_LV, KB_US, pckbd_keydesc_lv), KBD_MAP(KB_NL, KB_US, pckbd_keydesc_nl), KBD_MAP(KB_NL | KB_NODEAD, KB_NL, pckbd_keydesc_nl_nodead), -#endif /* SMALL_KERNEL */ +#endif /* WSKBD_NO_INTL_LAYOUTS */ {0, 0, 0, 0} }; |