From owner-svn-src-all@FreeBSD.ORG  Sat Nov  1 17:52:05 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8D7ADDF8;
 Sat,  1 Nov 2014 17:52:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 79D9316C;
 Sat,  1 Nov 2014 17:52:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA1Hq5Bj053535;
 Sat, 1 Nov 2014 17:52:05 GMT (envelope-from markm@FreeBSD.org)
Received: (from markm@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA1Hq59P053534;
 Sat, 1 Nov 2014 17:52:05 GMT (envelope-from markm@FreeBSD.org)
Message-Id: <201411011752.sA1Hq59P053534@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: markm set sender to
 markm@FreeBSD.org using -f
From: Mark Murray <markm@FreeBSD.org>
Date: Sat, 1 Nov 2014 17:52:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273939 - head/sys/modules
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.18-1
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: Sat, 01 Nov 2014 17:52:05 -0000

Author: markm
Date: Sat Nov  1 17:52:04 2014
New Revision: 273939
URL: https://svnweb.freebsd.org/changeset/base/273939

Log:
  Remove duplicate macro settings (probably due to an SVN merge /faux pas/ on my part.
  
  Spotted by: DES
  Approved by:	DES(implicit)

Modified:
  head/sys/modules/Makefile

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Sat Nov  1 17:22:53 2014	(r273938)
+++ head/sys/modules/Makefile	Sat Nov  1 17:52:04 2014	(r273939)
@@ -606,17 +606,6 @@ _x86bios=	x86bios
 _ixl=		ixl
 _ixlv=		ixlv
 _ntb=		ntb
-_nvd=		nvd
-_nvme=		nvme
-_nvram=		nvram
-_nxge=		nxge
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_opensolaris=	opensolaris
-.endif
-.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
-_padlock=	padlock
-.endif
-_pccard=	pccard
 _qlxge=		qlxge
 _qlxgb=		qlxgb
 _qlxgbe=	qlxgbe