Buildkernel broken

Hello,

I cvsupped the source this morning and I get:

[...]
===> firewire/firewire
cc -O -pipe -march=pentium2  -D_KERNEL -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -DKLD_MODULE -nostdinc -I-   -I. -I_at_ -I_at_/dev -I_at_/../include -fno-common -g -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -c /usr/src/sys/dev/firewire/firewire.c
cc -O -pipe -march=pentium2  -D_KERNEL -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -DKLD_MODULE -nostdinc -I-   -I. -I_at_ -I_at_/dev -I_at_/../include -fno-common -g -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -c /usr/src/sys/dev/firewire/fwohci.c
In file included from /usr/src/sys/dev/firewire/fwohci.c:72:
_at_/dev/firewire/fwdma.h:38: redefinition of `bus_dmasync_op_t'
machine/bus_dma.h:94: `bus_dmasync_op_t' previously declared here
*** Error code 1

[...]


Krzysztof