diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-04 12:03:16 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-04 12:04:51 -0500 |
| commit | 4ea41e2de5bba756858bb40f964e3490b6d1a25c (patch) | |
| tree | 51a688be321dd42f80d8a0c966eb6a60408d50b3 /include/linux/pci.h | |
| parent | 8d75da8afd068fa58b35e69c7c8c46770d9e7a98 (diff) | |
| parent | 398007f863a4af2b4a5a07219c5a617f1a098115 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming
Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.
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 174e5392e51e..c1968f464c38 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -756,6 +756,10 @@ pci_power_t pci_target_state(struct pci_dev *dev); | |||
| 756 | int pci_prepare_to_sleep(struct pci_dev *dev); | 756 | int pci_prepare_to_sleep(struct pci_dev *dev); |
| 757 | int pci_back_from_sleep(struct pci_dev *dev); | 757 | int pci_back_from_sleep(struct pci_dev *dev); |
| 758 | 758 | ||
| 759 | /* For use by arch with custom probe code */ | ||
| 760 | void set_pcie_port_type(struct pci_dev *pdev); | ||
| 761 | void set_pcie_hotplug_bridge(struct pci_dev *pdev); | ||
| 762 | |||
| 759 | /* Functions for PCI Hotplug drivers to use */ | 763 | /* Functions for PCI Hotplug drivers to use */ |
| 760 | int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap); | 764 | int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap); |
| 761 | #ifdef CONFIG_HOTPLUG | 765 | #ifdef CONFIG_HOTPLUG |