nvidia-driver does not compile again

[Rainer Hurling]

Yesterday I deinstalled a fully functional x11/nvidia-driver (Version 
9746) because I wanted to install the newest version of 
x11-servers/xorg-server (with imake.c patch).

Installing of xorg-server works fine, but after that I am not able to 
compile the nvidia-driver any more. The following error occurs within 
nvidia_pci.c:

-----
/usr/ports/x11/nvidia-driver# make && make install
[...snip...]
cc -O2 -fno-strict-aliasing -pipe -DNV_MAJOR_VERSION=1 
-DNV_MINOR_VERSION=0 -DNV_PATCHLEVEL=9746 -D__KERNEL__ -DNVRM -UDEBUG 
-U_DEBUG -DNDEBUG -O -fno-common -msoft-float -fno-unit-at-a-time 
-minline-all-stringops -Werror -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc 
-I-  -I/src -I. -I@ -I@/contrib/altq -finline-limit=8000 --param 
inline-unit-growth=100 --param large-function-growth=1000 -fno-common 
-mno-align-long-strings -mpreferred-stack-boundary=2  -mno-mmx 
-mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -Wall 
-Wredundant-decls -Wnested-externs -Wstrict-prototypes 
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef 
-fformat-extensions -c nvidia_pci.c
nvidia_pci.c: In function `nvidia_pci_setup_intr':
nvidia_pci.c:55: warning: passing arg 4 of `bus_setup_intr' from 
incompatible pointer type
nvidia_pci.c:55: warning: passing arg 5 of `bus_setup_intr' from 
incompatible pointer type
nvidia_pci.c:55: error: too few arguments to function `bus_setup_intr'
*** Error code 1

Stop in /usr/ports/x11/nvidia-driver/work/NVIDIA-FreeBSD-x86-1.0-9746/src.
*** Error code 1

Stop in /usr/ports/x11/nvidia-driver/work/NVIDIA-FreeBSD-x86-1.0-9746.
*** Error code 1

Stop in /usr/ports/x11/nvidia-driver.
*** Error code 1

Stop in /usr/ports/x11/nvidia-driver.
-----

It seems that there is a problem with PCI interrupt handling.

Does anybody else observe this? Are there any hints what to do next?

I am working with FreeBSD 7.0-CURRENT from today on i386.

Any help is greatly appreciated. Thanks in advance,

Rainer