summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJames Bottomley <jejb@raven.il.steeleye.com>2002-12-21 11:16:30 -0600
committerLinus Torvalds <torvalds@home.transmeta.com>2002-12-21 11:16:30 -0600
commit8f66ebafea96111a882690af6753e85402c1fad5 (patch)
tree2dfaa2ea0d7234295247d25e67f81a679e74fa27 /include/linux
parent1ebad6d8cc190eadc03f76c177a098be233466cf (diff)
allow pci primary busses to have parents in the device model
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pci.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index b4265360d2ec..3fa241545729 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -558,8 +558,16 @@ void pcibios_fixup_pbus_ranges(struct pci_bus *, struct pbus_set_ranges_data *);
/* Generic PCI functions used internally */
int pci_bus_exists(const struct list_head *list, int nr);
-struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata);
-struct pci_bus *pci_alloc_primary_bus(int bus);
+struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus, struct pci_ops *ops, void *sysdata);
+static inline struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata)
+{
+ return pci_scan_bus_parented(NULL, bus, ops, sysdata);
+}
+struct pci_bus *pci_alloc_primary_bus_parented(struct device * parent, int bus);
+static inline struct pci_bus *pci_alloc_primary_bus(int bus)
+{
+ return pci_alloc_primary_bus_parented(NULL, bus);
+}
struct pci_dev *pci_scan_slot(struct pci_dev *temp);
int pci_proc_attach_device(struct pci_dev *dev);
int pci_proc_detach_device(struct pci_dev *dev);