From owner-svn-src-all@freebsd.org  Wed Jul 15 01:04:55 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE03399C8C7;
 Wed, 15 Jul 2015 01:04:55 +0000 (UTC)
 (envelope-from pkelsey@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C9A421D2E;
 Wed, 15 Jul 2015 01:04:55 +0000 (UTC)
 (envelope-from pkelsey@FreeBSD.org)
Received: from svnmir.geo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6F14tWe050424;
 Wed, 15 Jul 2015 01:04:55 GMT (envelope-from pkelsey@FreeBSD.org)
Received: (from pkelsey@localhost)
 by svnmir.geo.freebsd.org (8.14.9/8.14.9/Submit) id t6F14tWm050423;
 Wed, 15 Jul 2015 01:04:55 GMT (envelope-from pkelsey@FreeBSD.org)
Message-Id: <201507150104.t6F14tWm050423@svnmir.geo.freebsd.org>
X-Authentication-Warning: svnmir.geo.freebsd.org: pkelsey set sender to
 pkelsey@FreeBSD.org using -f
From: Patrick Kelsey <pkelsey@FreeBSD.org>
Date: Wed, 15 Jul 2015 01:04:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285593 - head/sys/amd64/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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: Wed, 15 Jul 2015 01:04:56 -0000

Author: pkelsey
Date: Wed Jul 15 01:04:54 2015
New Revision: 285593
URL: https://svnweb.freebsd.org/changeset/base/285593

Log:
  Revert inadvertent change to amd64/GENERIC.

Modified:
  head/sys/amd64/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC	Wed Jul 15 01:02:01 2015	(r285592)
+++ head/sys/amd64/conf/GENERIC	Wed Jul 15 01:04:54 2015	(r285593)
@@ -362,7 +362,7 @@ device		xenpci			# Xen HVM Hypervisor se
 device		vmx			# VMware VMXNET3 Ethernet
 
 # Netmap provides direct access to TX/RX rings on supported NICs
-# device		netmap			# netmap(4) support
+device		netmap			# netmap(4) support
 
 # The crypto framework is required by IPSEC
 device		crypto			# Required by IPSEC