atkbd.c not compiling?

I updated my source tree this morning and now I'm seeing this compile
error in "make tinderbox";

/repos/users/rstone/freebsd/sys/dev/atkbdc/atkbd.c:382:26: error: use of undecla
red identifier 'key_map'; did you mean 'keymap'?
                keymap = malloc(sizeof(key_map), M_DEVBUF, M_NOWAIT);
                                       ^~~~~~~
                                       keymap
/repos/users/rstone/freebsd/sys/dev/atkbdc/atkbd.c:358:12: note: 'keymap' declar
ed here
        keymap_t *keymap;
/repos/users/rstone/freebsd/sys/dev/atkbdc/atkbd.c:383:26: error: use of undecla
red identifier 'accent_map'; did you mean 'accentmap_t'?
                accmap = malloc(sizeof(accent_map), M_DEVBUF, M_NOWAIT);
                                       ^
/repos/users/rstone/freebsd/sys/sys/kbio.h:210:26: note: 'accentmap_t' declared
here
typedef struct accentmap accentmap_t;



(By the way, this is the second time in two days that "make tinderbox"
has been broken for me.  It's extremely frustrating that I can't test
my pending commits because others haven't done me the same courtesy)