From owner-p4-projects@FreeBSD.ORG  Thu Nov 16 03:51:25 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B51B816A416; Thu, 16 Nov 2006 03:51:25 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 729CF16A412
	for <perforce@freebsd.org>; Thu, 16 Nov 2006 03:51:25 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A7F3C43D66
	for <perforce@freebsd.org>; Thu, 16 Nov 2006 03:51:18 +0000 (GMT)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAG3pIXQ063384
	for <perforce@freebsd.org>; Thu, 16 Nov 2006 03:51:18 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAG3pIXV063378
	for perforce@freebsd.org; Thu, 16 Nov 2006 03:51:18 GMT
	(envelope-from mjacob@freebsd.org)
Date: Thu, 16 Nov 2006 03:51:18 GMT
Message-Id: <200611160351.kAG3pIXV063378@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 110094 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Nov 2006 03:51:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=110094

Change 110094 by mjacob@newisp on 2006/11/16 03:50:38

	Pull in mpt_pci.c change.

Affected files ...

.. //depot/projects/newisp/dev/mpt/mpt_pci.c#5 integrate

Differences ...

==== //depot/projects/newisp/dev/mpt/mpt_pci.c#5 (text+ko) ====

@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.41 2006/11/15 21:41:59 jb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.42 2006/11/16 02:40:18 mjacob Exp $");
 
 #include <dev/mpt/mpt.h>
 #include <dev/mpt/mpt_cam.h>
@@ -512,7 +512,6 @@
 
 	/* Get a handle to the interrupt */
 	iqd = 0;
-#if	0
 	if (pci_msi_count(dev) == 1) {
 		mpt->pci_msi_count = 1;
 		if (pci_alloc_msi(dev, &mpt->pci_msi_count) == 0)
@@ -520,7 +519,6 @@
 		else
 			mpt->pci_msi_count = 0;
 	}	
-#endif
 	mpt->pci_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &iqd,
 	    RF_ACTIVE | RF_SHAREABLE);
 	if (mpt->pci_irq == NULL) {