drivers/pci/hotplug-pci.c

   1 /* Core PCI functionality used only by PCI hotplug */
   2
   3 #include <linux/pci.h>
   4 #include "pci.h"
   5
   6
   7 <<<<<<< HEAD:drivers/pci/hotplug-pci.c
   8 unsigned int pci_do_scan_bus(struct pci_bus *bus)
   9 =======
  10 unsigned int __devinit pci_do_scan_bus(struct pci_bus *bus)
  11 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:drivers/pci/hotplug-pci.c
  12 {
  13         unsigned int max;
  14
  15         max = pci_scan_child_bus(bus);
  16
  17         /*
  18          * Make the discovered devices available.
  19          */
  20         pci_bus_add_devices(bus);
  21
  22         return max;
  23 }
  24 EXPORT_SYMBOL(pci_do_scan_bus);