Module Name: src
Committed By: tsutsui
Date: Sun Apr 19 18:08:56 UTC 2009
Modified Files:
src/sys/dist/ipf/netinet: ip_fil_netbsd.c
Log Message:
Fix harmless merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dist/ipf/netinet/ip_fil_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dist/ipf/netinet/ip_fil_netbsd.c
diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.48 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.49
--- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.48 Thu Feb 12 12:12:39 2009
+++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Sun Apr 19 18:08:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil_netbsd.c,v 1.48 2009/02/12 12:12:39 bouyer Exp $ */
+/* $NetBSD: ip_fil_netbsd.c,v 1.49 2009/04/19 18:08:56 tsutsui Exp $ */
/*
* Copyright (C) 1993-2003 by Darren Reed.
@@ -8,7 +8,7 @@
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.48 2009/02/12 12:12:39 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.49 2009/04/19 18:08:56 tsutsui Exp $");
#else
static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 2.55.2.59 2008/03/01 23:16:38 darrenr Exp";
@@ -50,10 +50,6 @@
# include <sys/kauth.h>
#endif
-#if (__NetBSD_Version__ >= 399002000)
-#include <sys/kauth.h>
-#endif
-
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>
