From owner-svn-src-stable@FreeBSD.ORG  Tue Jan 18 20:26:41 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1F1A41065672;
	Tue, 18 Jan 2011 20:26:41 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0DF908FC08;
	Tue, 18 Jan 2011 20:26:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0IKQeIB050946;
	Tue, 18 Jan 2011 20:26:40 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0IKQeMY050944;
	Tue, 18 Jan 2011 20:26:40 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201101182026.p0IKQeMY050944@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 18 Jan 2011 20:26:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217553 - stable/8/sys/modules
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Jan 2011 20:26:41 -0000

Author: imp
Date: Tue Jan 18 20:26:40 2011
New Revision: 217553
URL: http://svn.freebsd.org/changeset/base/217553

Log:
  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.

Modified:
  stable/8/sys/modules/Makefile

Modified: stable/8/sys/modules/Makefile
==============================================================================
--- stable/8/sys/modules/Makefile	Tue Jan 18 19:36:04 2011	(r217552)
+++ stable/8/sys/modules/Makefile	Tue Jan 18 20:26:40 2011	(r217553)
@@ -339,6 +339,8 @@ _siba_bwn=	siba_bwn
 _sym=		sym
 # no uart_cpu_$MACHINE_ARCH
 _uart=		uart
+# disable_intr() interferes
+_cxgb=		cxgb
 .endif
 
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)