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/arch | |
| 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/arch')
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISK | 3 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISKB | 3 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/gsckbdmap.c | 10 |
3 files changed, 9 insertions, 7 deletions
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK index b30acf86b8f..b113a0dfc75 100644 --- a/sys/arch/alpha/conf/RAMDISK +++ b/sys/arch/alpha/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.67 2007/08/01 16:30:00 miod Exp $ +# $OpenBSD: RAMDISK,v 1.68 2008/03/21 17:10:33 miod Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ machine alpha # architecture, used by config; REQUIRED @@ -42,6 +42,7 @@ option INET # Internet protocol suite #option PCIVERBOSE # recognize "unknown" PCI devices #option TCVERBOSE # recognize "unknown" TC devices option SCSITERSE # less verbose scsi error messages +option WSKBD_NO_INTL_LAYOUTS # no international keyboard layouts option BOOT_CONFIG diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB index 0029165b289..4b367b2ca76 100644 --- a/sys/arch/alpha/conf/RAMDISKB +++ b/sys/arch/alpha/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.31 2007/08/01 16:30:00 miod Exp $ +# $OpenBSD: RAMDISKB,v 1.32 2008/03/21 17:10:33 miod Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ machine alpha # architecture, used by config; REQUIRED @@ -41,6 +41,7 @@ option INET # Internet protocol suite #option PCIVERBOSE # recognize "unknown" PCI devices #option TCVERBOSE # recognize "unknown" TC devices option SCSITERSE # less verbose scsi error messages +option WSKBD_NO_INTL_LAYOUTS # no international keyboard layouts option BOOT_CONFIG diff --git a/sys/arch/hppa/gsc/gsckbdmap.c b/sys/arch/hppa/gsc/gsckbdmap.c index fea6c62a546..f6f0bb0376d 100644 --- a/sys/arch/hppa/gsc/gsckbdmap.c +++ b/sys/arch/hppa/gsc/gsckbdmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gsckbdmap.c,v 1.19 2006/12/05 21:28:02 otto Exp $ */ +/* $OpenBSD: gsckbdmap.c,v 1.20 2008/03/21 17:10:46 miod Exp $ */ /* * THIS FILE IS AUTOMAGICALLY GENERATED. DO NOT EDIT. @@ -209,7 +209,7 @@ static const keysym_t gsckbd_keydesc_precisionbook[] = { KC(140), KS_Meta_R, }; -#if !defined(SMALL_KERNEL) || !defined(__alpha__) +#if !defined(WSKBD_NO_INTL_LAYOUTS) static const keysym_t gsckbd_keydesc_de[] = { /* pos normal shifted altgr shift-altgr */ @@ -982,14 +982,14 @@ static const keysym_t gsckbd_keydesc_nl_nodead[] = { KC(85), KS_degree, KS_asciitilde, KS_cedilla, }; -#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 gsckbd_keydesctab[] = { KBD_MAP(KB_US, 0, gsckbd_keydesc_us), -#if !defined(SMALL_KERNEL) || !defined(__alpha__) +#if !defined(WSKBD_NO_INTL_LAYOUTS) KBD_MAP(KB_DE, KB_US, gsckbd_keydesc_de), KBD_MAP(KB_DE | KB_NODEAD, KB_DE, gsckbd_keydesc_de_nodead), KBD_MAP(KB_FR, KB_US, gsckbd_keydesc_fr), @@ -1034,7 +1034,7 @@ const struct wscons_keydesc gsckbd_keydesctab[] = { KBD_MAP(KB_LV, KB_US, gsckbd_keydesc_lv), KBD_MAP(KB_NL, KB_US, gsckbd_keydesc_nl), KBD_MAP(KB_NL | KB_NODEAD, KB_NL, gsckbd_keydesc_nl_nodead), -#endif /* SMALL_KERNEL */ +#endif /* WSKBD_NO_INTL_LAYOUTS */ KBD_MAP(KB_US | KB_MACHDEP, KB_US, gsckbd_keydesc_precisionbook), {0, 0, 0, 0} }; |