Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / pci.h

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 59a98e2ee2c69c5b32ec70e5cec2b4da210a3283..e2575f86133afb5d9a4c9328c5998ff04ba0b1ec 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -759,6 +759,10 @@ pci_power_t pci_target_state(struct pci_dev *dev);
 int pci_prepare_to_sleep(struct pci_dev *dev);
 int pci_back_from_sleep(struct pci_dev *dev);
 
+/* For use by arch with custom probe code */
+void set_pcie_port_type(struct pci_dev *pdev);
+void set_pcie_hotplug_bridge(struct pci_dev *pdev);
+
 /* Functions for PCI Hotplug drivers to use */
 int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap);
 #ifdef CONFIG_HOTPLUG