PERFORCE change 197088 for review

[John Baldwin]

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

Change 197088 by jhb at 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);