diff --git a/[refs] b/[refs] index 9b73a957f110..aabf9421dfc6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2502dbdfc878a801b5e6d0b6901c334f4051ca39 +refs/heads/master: cfce9fb808d7d25f6ea18a804eb71b08c7d777c1 diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index 4286b853956e..569341d2d527 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -1453,8 +1453,10 @@ extern u8 pci_cache_line_size; extern unsigned long pci_hotplug_io_size; extern unsigned long pci_hotplug_mem_size; +/* Architecture specific versions may override these (weak) */ int pcibios_add_platform_entries(struct pci_dev *dev); void pcibios_disable_device(struct pci_dev *dev); +void pcibios_set_master(struct pci_dev *dev); int pcibios_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state);