From owner-p4-projects@FreeBSD.ORG  Tue Dec 16 04:41:48 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4386310657B9; Tue, 16 Dec 2008 04:41:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0799610657B7
	for <perforce@freebsd.org>; Tue, 16 Dec 2008 04:41:48 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DA3D08FC26
	for <perforce@freebsd.org>; Tue, 16 Dec 2008 04:41:47 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBG4flPb087414
	for <perforce@freebsd.org>; Tue, 16 Dec 2008 04:41:47 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBG4fl1V087412
	for perforce@freebsd.org; Tue, 16 Dec 2008 04:41:47 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Tue, 16 Dec 2008 04:41:47 GMT
Message-Id: <200812160441.mBG4fl1V087412@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 154770 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: Tue, 16 Dec 2008 04:41:48 -0000

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

Change 154770 by nwhitehorn@nwhitehorn_trantor on 2008/12/16 04:41:46

	Fix mismerge.

Affected files ...

.. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#7 edit

Differences ...

==== //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#7 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/sparc64/pci/ofw_pcibus.c,v 1.21 2008/08/24 15:05:46 marius Exp $");
+__FBSDID("$FreeBSD: head/sys/powerpc/ofw/ofw_pcibus.c 186128 2008-12-15 15:31:10Z nwhitehorn $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -226,9 +226,6 @@
 	int s, f, pcifunchigh;
 	uint8_t hdrtype;
 
-	KASSERT(dinfo_size >= sizeof(struct pci_devinfo),
-	    ("dinfo_size too small"));
-
 	pcib = device_get_parent(dev);
 
 	maxslots = PCIB_MAXSLOTS(pcib);