nVidia driver won't compile on -CURRENT

[adamk75]

Not sure exactly when this broke, but 9755 can't compile on a recent pull of 7.0-CURRENT from cvs:

cc -O2 -fno-strict-aliasing -pipe -DNV_MAJOR_VERSION=1 -DNV_MINOR_VERSION=0 -DNV_PATCHLEVEL=9755 -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 /home/adamk/saved/source/NVIDIA-FreeBSD-x86-1.0-9755/src.

EDIT:

Nevermind: http://www.nvnews.net/vbulletin/showthread.php?t=87019

[zander]

BTW, a more generic patch that doesn't break backwards compatibility is:

@@ -52,7 +52,11 @@
     /* XXX Revisit! (INTR_FAST, INTR_MPSAFE) */
     flags = INTR_TYPE_AV;
 
+#if __FreeBSD_version >= 700031
+    status = bus_setup_intr(dev, sc->irq, flags, NULL, nvidia_intr, sc, &sc->irq_ih);
+#else
     status = bus_setup_intr(dev, sc->irq, flags, nvidia_intr, sc, &sc->irq_ih);
+#endif
     if (status) {
         device_printf(dev, "NVRM: HW ISR setup failed.\n");
         goto fail;