From owner-svn-src-stable-9@FreeBSD.ORG  Thu Nov 29 17:35:58 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4A5AA4B6;
 Thu, 29 Nov 2012 17:35:58 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2E3F28FC0C;
 Thu, 29 Nov 2012 17:35:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qATHZwTp026354;
 Thu, 29 Nov 2012 17:35:58 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qATHZwvL026352;
 Thu, 29 Nov 2012 17:35:58 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201211291735.qATHZwvL026352@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 29 Nov 2012 17:35:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243676 - in stable/9/sys: modules netinet6
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Nov 2012 17:35:58 -0000

Author: ae
Date: Thu Nov 29 17:35:57 2012
New Revision: 243676
URL: http://svnweb.freebsd.org/changeset/base/243676

Log:
  MFC r243336:
    Remove opt_inet.h, it isn't required here.
  
  MFC r243337:
    Connect ip6_mroute kernel module to the build.

Modified:
  stable/9/sys/modules/Makefile
  stable/9/sys/netinet6/ip6_mroute.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/sys/modules/Makefile
==============================================================================
--- stable/9/sys/modules/Makefile	Thu Nov 29 15:08:13 2012	(r243675)
+++ stable/9/sys/modules/Makefile	Thu Nov 29 17:35:57 2012	(r243676)
@@ -147,6 +147,7 @@ SUBDIR=	\
 	${_ipfw} \
 	ipfw_nat \
 	${_ipmi} \
+	ip6_mroute_mod \
 	ip_mroute_mod \
 	${_ips} \
 	${_ipw} \

Modified: stable/9/sys/netinet6/ip6_mroute.c
==============================================================================
--- stable/9/sys/netinet6/ip6_mroute.c	Thu Nov 29 15:08:13 2012	(r243675)
+++ stable/9/sys/netinet6/ip6_mroute.c	Thu Nov 29 17:35:57 2012	(r243676)
@@ -81,7 +81,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_inet.h"
 #include "opt_inet6.h"
 
 #include <sys/param.h>