Unable to compile kernel

Hello. Today I've had problems compiling my VIMES kernel which is 99%
identical to GENERIC from CURRENT. I've CVSUP'ed twice today (the last one 20-30
minutes ago) and I still get this error during the compile. Here are the
last few lines I see (there are some long lines here):

cc -c -O -pipe -march=pentium2 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -g -nostdinc -I-  -I. -I/usr/src/sys -I/usr/src/sys/contrib/dev/acpica -I/usr/src/sys/contrib/ipfilter -I/usr/src/sys/contrib/dev/ath -I/usr/src/sys/contrib/dev/ath/freebsd -D_KERNEL -include opt_global.h -fno-common -finline-limit=15000 -fno-strict-aliasing  -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Werror  /usr/src/sys/contrib/ipfilter/netinet/ip_fil.c
/usr/src/sys/contrib/ipfilter/netinet/ip_fil.c: In function `fr_check_wrapper':
/usr/src/sys/contrib/ipfilter/netinet/ip_fil.c:319: error: `PFIL_OUT' undeclared (first use in this function)
/usr/src/sys/contrib/ipfilter/netinet/ip_fil.c:319: error: (Each undeclared identifier is reported only once
/usr/src/sys/contrib/ipfilter/netinet/ip_fil.c:319: error: for each function it appears in.)
/usr/src/sys/contrib/ipfilter/netinet/ip_fil.c: In function `fr_check_wrapper6':
/usr/src/sys/contrib/ipfilter/netinet/ip_fil.c:329: error: `PFIL_OUT' undeclared (first use in this function)
/usr/src/sys/contrib/ipfilter/netinet/ip_fil.c: In function `iplattach':
/usr/src/sys/contrib/ipfilter/netinet/ip_fil.c:376: warning: unused variable `ph_inet'
/usr/src/sys/contrib/ipfilter/netinet/ip_fil.c:378: warning: unused variable `ph_inet6'
/usr/src/sys/contrib/ipfilter/netinet/ip_fil.c: At top level:
/usr/src/sys/contrib/ipfilter/netinet/ip_fil.c:317: warning: `fr_check_wrapper' defined but not used
/usr/src/sys/contrib/ipfilter/netinet/ip_fil.c:327: warning: `fr_check_wrapper6' defined but not used
*** Error code 1

Stop in /usr/obj/usr/src/sys/VIMES.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
vimes# 


Here's the diff between plain GENERIC and my VIMES kernel:

vimes# diff GENERIC VIMES
25c25
< ident         GENERIC
---
> ident         VIMES
63,66c63,66
< options       INVARIANTS              #Enable calls of extra sanity checking
< options       INVARIANT_SUPPORT       #Extra sanity checks of internal structures, required by INVARIANTS
< options       WITNESS                 #Enable checks to detect deadlocks and cycles
< options       WITNESS_SKIPSPIN        #Don't run witness on spinlocks for speed
---
> #options      INVARIANTS              #Enable calls of extra sanity checking
> #options      INVARIANT_SUPPORT       #Extra sanity checks of internal structures, required by INVARIANTS
> #options      WITNESS                 #Enable checks to detect deadlocks and cycles
> #options      WITNESS_SKIPSPIN        #Don't run witness on spinlocks for speed
272a273,278
>
> # These options are a subset of the IPFILTER options.
> options       IPFILTER                #ipfilter support
> options       IPFILTER_LOG            #ipfilter logging
> options       IPFILTER_DEFAULT_BLOCK  #block all packets by default
>
vimes#

Any suggestions? I need ipfilter-support and I've had problems when using it as a module.

-- 
Regards / Hilsen
Eivind Olsen
<eivind_at_aminor.no>