diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-17 01:09:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 01:09:29 -0500 |
| commit | 2bb4646fce8d09916b351d1a62f98db7cec6fc41 (patch) | |
| tree | c1f0d002e69868606eca9d1b919835f422892063 /include/linux/pci.h | |
| parent | 6836b9bdd98e3b500cd49512484df68f46e14659 (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 59a98e2ee2c6..e2575f86133a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -759,6 +759,10 @@ pci_power_t pci_target_state(struct pci_dev *dev); | |||
| 759 | int pci_prepare_to_sleep(struct pci_dev *dev); | 759 | int pci_prepare_to_sleep(struct pci_dev *dev); |
| 760 | int pci_back_from_sleep(struct pci_dev *dev); | 760 | int pci_back_from_sleep(struct pci_dev *dev); |
| 761 | 761 | ||
| 762 | /* For use by arch with custom probe code */ | ||
| 763 | void set_pcie_port_type(struct pci_dev *pdev); | ||
| 764 | void set_pcie_hotplug_bridge(struct pci_dev *pdev); | ||
| 765 | |||
| 762 | /* Functions for PCI Hotplug drivers to use */ | 766 | /* Functions for PCI Hotplug drivers to use */ |
| 763 | int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap); | 767 | int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap); |
| 764 | #ifdef CONFIG_HOTPLUG | 768 | #ifdef CONFIG_HOTPLUG |