diff --git a/[refs] b/[refs] index d245afb45d0d..f979ae803302 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10c86be57724adf44c266300964182fd2966d108 +refs/heads/master: d80d02173360562625c10a526132fb87be4de2a4 diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index fbf3766dac1e..086a0e5a6318 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -748,6 +748,17 @@ static inline void pci_release_regions(struct pci_dev *dev) { } static inline void pci_block_user_cfg_access(struct pci_dev *dev) { } static inline void pci_unblock_user_cfg_access(struct pci_dev *dev) { } +static inline struct pci_bus *pci_find_next_bus(const struct pci_bus *from) +{ return NULL; } + +static inline struct pci_dev *pci_get_slot(struct pci_bus *bus, + unsigned int devfn) +{ return NULL; } + +static inline struct pci_dev *pci_get_bus_and_slot(unsigned int bus, + unsigned int devfn) +{ return NULL; } + #endif /* CONFIG_PCI */ /* Include architecture-dependent settings and functions */