From owner-p4-projects@FreeBSD.ORG  Sat Jun 25 12:31:06 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7E3511065670; Sat, 25 Jun 2011 12:31:06 +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 40C31106564A
	for <perforce@freebsd.org>; Sat, 25 Jun 2011 12:31:06 +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 2FAC48FC1A
	for <perforce@freebsd.org>; Sat, 25 Jun 2011 12:31:06 +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 p5PCV6Jk059892
	for <perforce@freebsd.org>; Sat, 25 Jun 2011 12:31:06 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5PCV6AD059888
	for perforce@freebsd.org; Sat, 25 Jun 2011 12:31:06 GMT
	(envelope-from jhb@freebsd.org)
Date: Sat, 25 Jun 2011 12:31:06 GMT
Message-Id: <201106251231.p5PCV6AD059888@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 195301 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: Sat, 25 Jun 2011 12:31:06 -0000

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

Change 195301 by jhb@jhb_kavik on 2011/06/25 12:30:21

	Sort.

Affected files ...

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

Differences ...

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

@@ -115,13 +115,13 @@
 
 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);
 void		pcib_attach_common(device_t dev);
+#ifdef NEW_PCIB
+const char	*pcib_child_name(device_t child);
+#endif
 int		pcib_read_ivar(device_t dev, device_t child, int which, uintptr_t *result);
 int		pcib_write_ivar(device_t dev, device_t child, int which, uintptr_t value);
 struct resource *pcib_alloc_resource(device_t dev, device_t child, int type, int *rid,