diff options
author | Renato Botelho <renato@netgate.com> | 2016-05-17 20:44:51 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-05-17 20:44:51 -0300 |
commit | 41814fd21079b0bc65316a7a4678b1032d25cee6 (patch) | |
tree | 410f30e2b21a00404e2dec119a4a33d722439686 /sys/dev | |
parent | 7170d3e134d43d3c22dc7be7a626d1b4cc5297a3 (diff) | |
parent | 8a232783c3444677eb1faa3048123dda21767094 (diff) | |
download | FreeBSD-src-41814fd21079b0bc65316a7a4678b1032d25cee6.zip FreeBSD-src-41814fd21079b0bc65316a7a4678b1032d25cee6.tar.gz |
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/kbd/kbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c index 8036762..f1a1b29 100644 --- a/sys/dev/kbd/kbd.c +++ b/sys/dev/kbd/kbd.c @@ -996,7 +996,7 @@ genkbd_commonioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) splx(s); return (error); } - kbd->kb_fkeytab[fkeyp->keynum].len = imin(fkeyp->flen, MAXFK); + kbd->kb_fkeytab[fkeyp->keynum].len = min(fkeyp->flen, MAXFK); bcopy(fkeyp->keydef, kbd->kb_fkeytab[fkeyp->keynum].str, kbd->kb_fkeytab[fkeyp->keynum].len); break; |