From owner-svn-src-head@FreeBSD.ORG  Mon Mar 29 19:36:38 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 11783106566B;
	Mon, 29 Mar 2010 19:36:38 +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 011BE8FC16;
	Mon, 29 Mar 2010 19:36:38 +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 o2TJabPK051296;
	Mon, 29 Mar 2010 19:36:37 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2TJabtY051294;
	Mon, 29 Mar 2010 19:36:37 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201003291936.o2TJabtY051294@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 29 Mar 2010 19:36:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205852 - head/sys/modules
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Mar 2010 19:36:38 -0000

Author: imp
Date: Mon Mar 29 19:36:37 2010
New Revision: 205852
URL: http://svn.freebsd.org/changeset/base/205852

Log:
  Arm defines intr_disable() as a macro, which causes problems for cxgb.
  Rather than remove it for all architectures (which was a botch in
  r205845), remove it only for arm and mips until that can be sorted out.
  
  Pointy Hat: imp
  
  Submitted by:	Navdeep Parhar
  MFC after:	7 days

Modified:
  head/sys/modules/Makefile

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Mon Mar 29 19:13:34 2010	(r205851)
+++ head/sys/modules/Makefile	Mon Mar 29 19:36:37 2010	(r205852)
@@ -330,6 +330,8 @@ _siba_bwn=	siba_bwn
 _sym=		sym
 # no uart_cpu_$MACHINE_ARCH
 _uart=		uart
+# intr_disable() is a macro, causes problems
+_cxgb=		cxgb
 .endif
 
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)