32bit compile error w/ v1.6-115-g4a302e2

Happened within a 32 bit KVM of a stable gentoo:

i686-pc-linux-gnu-gcc -O2 -march=i686 -pipe -g -ggdb -Wall -W -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__ -Wdeclaration-after-statement -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes -Wlogical-op -Wstrict-aliasing=3 -Wno-maybe-uninitialized -o ioctls/nvme.o -c ioctls/nvme.c In file included from ioctls/nvme.c:5:0:
ioctls/nvme.c:11:8: error: ‘NVME_IOCTL_IO_CMD’ undeclared here (not in a function)
IOCTL(NVME_IOCTL_IO_CMD),

        ^
include/ioctls.h:53:15: note: in definition of macro ‘IOCTL’
  { .request = _request, .name = #_request, }
               ^
i686-pc-linux-gnu-gcc -O2 -march=i686 -pipe -g -ggdb -Wall -W  -I. -Iinclude/ -Wimplicit  -D_GNU_SOURCE -D__linux__  -Wdeclaration-after-statement -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes -Wlogical-op -Wstrict-aliasing=3 -Wno-maybe-uninitialized -o ioctls/ozwpan.o -c ioctls/ozwpan.c
ioctls/nvme.c:12:8: error: ‘NVME_IOCTL_RESET’ undeclared here (not in a function)
  IOCTL(NVME_IOCTL_RESET),
        ^
include/ioctls.h:53:15: note: in definition of macro ‘IOCTL’
  { .request = _request, .name = #_request, }
               ^

Makefile:105: recipe for target 'ioctls/nvme.o' failed
make: *** [ioctls/nvme.o] Error 1
* ERROR: dev-util/trinity-9::local failed (compile phase):
* emake failed

Toralf, pgp: C4EACDDE 0076E94E