From owner-p4-projects@FreeBSD.ORG  Tue Aug  2 20:21:36 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7AEED10657F0; Tue,  2 Aug 2011 20:21:36 +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 3B0C110657EA
	for <perforce@freebsd.org>; Tue,  2 Aug 2011 20:21:36 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 21A788FC13
	for <perforce@freebsd.org>; Tue,  2 Aug 2011 20:21:35 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p72KLZW8049407
	for <perforce@freebsd.org>; Tue, 2 Aug 2011 20:21:35 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p72KLZRP049404
	for perforce@freebsd.org; Tue, 2 Aug 2011 20:21:35 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 2 Aug 2011 20:21:35 GMT
Message-Id: <201108022021.p72KLZRP049404@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 197088 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 02 Aug 2011 20:21:36 -0000

http://p4web.freebsd.org/@@197088?ac=10

Change 197088 by jhb@jhb_jhbbsd on 2011/08/02 20:20:47

	Mismerge.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pcib_private.h#20 edit

Differences ...

==== //depot/projects/pci/sys/dev/pci/pcib_private.h#20 (text+ko) ====

@@ -115,9 +115,6 @@
 
 typedef uint32_t pci_read_config_fn(int b, int s, int f, int reg, int width);
 
-#ifdef NEW_PCIB
-const char	*pcib_child_name(device_t child);
-#endif
 int		host_pcib_get_busno(pci_read_config_fn read_config, int bus,
     int slot, int func, uint8_t *busnum);
 int		pcib_attach(device_t dev);