From owner-p4-projects@FreeBSD.ORG  Mon Jun 12 19:51:09 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 6323916A474; Mon, 12 Jun 2006 19:51:09 +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 4027416A46F
	for <perforce@freebsd.org>; Mon, 12 Jun 2006 19:51:09 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0C4E743D45
	for <perforce@freebsd.org>; Mon, 12 Jun 2006 19:51:09 +0000 (GMT)
	(envelope-from jhb@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 k5CJmrr6004245
	for <perforce@freebsd.org>; Mon, 12 Jun 2006 19:48:53 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CJmr6b004242
	for perforce@freebsd.org; Mon, 12 Jun 2006 19:48:53 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 12 Jun 2006 19:48:53 GMT
Message-Id: <200606121948.k5CJmr6b004242@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 99069 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: Mon, 12 Jun 2006 19:51:09 -0000

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

Change 99069 by jhb@jhb_mutex on 2006/06/12 19:48:22

	IFC @99067.

Affected files ...

.. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#40 delete
.. //depot/projects/smpng/sys/alpha/include/md_var.h#11 delete
.. //depot/projects/smpng/sys/alpha/include/ptrace.h#11 delete
.. //depot/projects/smpng/sys/dev/puc/pucdata.c#36 integrate
.. //depot/projects/smpng/sys/dev/sound/midi/midi.c#10 branch
.. //depot/projects/smpng/sys/dev/sound/midi/midi.h#8 branch
.. //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#11 branch
.. //depot/projects/smpng/sys/dev/sound/midi/sequencer.h#4 branch

Differences ...

==== //depot/projects/smpng/sys/dev/puc/pucdata.c#36 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.55 2006/04/28 21:21:52 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.56 2006/06/12 19:22:44 imp Exp $");
 
 /*
  * PCI "universal" communications card driver configuration data (used to
@@ -38,6 +38,7 @@
 #include <sys/bus.h>
 
 #include <machine/resource.h>
+#include <machine/bus.h>
 #include <sys/rman.h>
 
 #include <dev/pci/pcivar.h>