From owner-svn-src-all@FreeBSD.ORG  Mon Jun 15 22:07:22 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 035A01065674;
	Mon, 15 Jun 2009 22:07:22 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E4C398FC16;
	Mon, 15 Jun 2009 22:07:21 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5FM7L51003360;
	Mon, 15 Jun 2009 22:07:21 GMT (envelope-from gnn@svn.freebsd.org)
Received: (from gnn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5FM7LPj003359;
	Mon, 15 Jun 2009 22:07:21 GMT (envelope-from gnn@svn.freebsd.org)
Message-Id: <200906152207.n5FM7LPj003359@svn.freebsd.org>
From: "George V. Neville-Neil" <gnn@FreeBSD.org>
Date: Mon, 15 Jun 2009 22:07:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194270 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	netgraph
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Jun 2009 22:07:22 -0000

Author: gnn
Date: Mon Jun 15 22:07:21 2009
New Revision: 194270
URL: http://svn.freebsd.org/changeset/base/194270

Log:
  MFC of 179973
  
  Make it simpler to build netgraph modules outside of the kernel source
  tree.  This change follows similar ones in the device tree.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/netgraph/netgraph.h

Modified: stable/7/sys/netgraph/netgraph.h
==============================================================================
--- stable/7/sys/netgraph/netgraph.h	Mon Jun 15 21:55:29 2009	(r194269)
+++ stable/7/sys/netgraph/netgraph.h	Mon Jun 15 22:07:21 2009	(r194270)
@@ -54,7 +54,9 @@
 #include <sys/module.h>
 #include <sys/mutex.h>
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_netgraph.h"
+#endif
 
 /* debugging options */
 #define NG_SEPARATE_MALLOC	/* make modules use their own malloc types */