PERFORCE change 145681 for review

[Marko Zec]

http://perforce.freebsd.org/chv.cgi?CH=145681

Change 145681 by zec at zec_tpx32 on 2008/07/23 08:38:13

	Unbreak GENERIC build.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#7 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
 #if defined(_KERNEL) && defined(__FreeBSD_version) && \
     (__FreeBSD_version >= 220000)
 # if (__FreeBSD_version >= 400000)
-#  if !defined(IPFILTER_LKM)
+#  if (__FreeBSD_version >= 800000)
 #   include "opt_vimage.h"
 #   include "opt_inet6.h"
 #   include <sys/vimage.h>

==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#7 (text+ko) ====

@@ -61,7 +61,7 @@
 #include <sys/random.h>
 #include <sys/limits.h>
 #include <sys/queue.h>
-#if defined(__FreeBSD__) && __FreeBSD_version > 800000 && defined(VIMAGE)
+#if defined(__FreeBSD__) && __FreeBSD_version > 800000
 #include <sys/vimage.h>
 #endif
 #include <machine/cpu.h>