From owner-cvs-src-old@FreeBSD.ORG  Tue Jan 18 20:26:55 2011
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D936C1065698
	for <cvs-src-old@freebsd.org>; Tue, 18 Jan 2011 20:26:55 +0000 (UTC)
	(envelope-from imp@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FB1F8FC22
	for <cvs-src-old@freebsd.org>; Tue, 18 Jan 2011 20:26:55 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p0IKQtFk022397
	for <cvs-src-old@freebsd.org>; Tue, 18 Jan 2011 20:26:55 GMT
	(envelope-from imp@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p0IKQtvE022396
	for cvs-src-old@freebsd.org; Tue, 18 Jan 2011 20:26:55 GMT
	(envelope-from imp@repoman.freebsd.org)
Message-Id: <201101182026.p0IKQtvE022396@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	imp@repoman.freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 18 Jan 2011 20:26:40 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
Subject: cvs commit: src/sys/modules Makefile
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Jan 2011 20:26:55 -0000

imp         2011-01-18 20:26:40 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    sys/modules          Makefile 
  Log:
  SVN rev 217553 on 2011-01-18 20:26:40Z by imp
  
  Fix mismerge.  The missing _cxgb=cxgb assignment was causing cxgb to
  not be built at all, rather than causing it to not be built on just
  arm and mips.
  
  # The merge info looks correct, so this looks like a direct commit.
  
  Revision    Changes    Path
  1.623.2.27  +2 -0      src/sys/modules/Makefile