diff --git a/[refs] b/[refs] index e73647c85cef..2de53574f3d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 498879417756effe6dc385ee04645a83d724fdef +refs/heads/master: ac7dc65ac0b945270548414491efa9c4357417d9 diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index 3c9834d80850..adfad4fd6a13 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/drivers/pci/probe.c @@ -717,7 +717,7 @@ static void pci_release_dev(struct device *dev) * reading the dword at 0x100 which must either be 0 or a valid extended * capability header. */ -static int pci_cfg_space_size(struct pci_dev *dev) +int pci_cfg_space_size(struct pci_dev *dev) { int pos; u32 status; diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index b32f70fe2dbd..d0e003926744 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -449,6 +449,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass void pci_walk_bus(struct pci_bus *top, void (*cb)(struct pci_dev *, void *), void *userdata); +int pci_cfg_space_size(struct pci_dev *dev); /* kmem_cache style wrapper around pci_alloc_consistent() */