aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pci.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index d8c379dba6ad..8c8b44d62105 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -368,6 +368,8 @@ static inline int pci_channel_offline(struct pci_dev *pdev)
368 return (pdev->error_state != pci_channel_io_normal); 368 return (pdev->error_state != pci_channel_io_normal);
369} 369}
370 370
371extern struct resource busn_resource;
372
371struct pci_host_bridge_window { 373struct pci_host_bridge_window {
372 struct list_head list; 374 struct list_head list;
373 struct resource *res; /* host bridge aperture (CPU address) */ 375 struct resource *res; /* host bridge aperture (CPU address) */
@@ -419,6 +421,7 @@ struct pci_bus {
419 struct list_head slots; /* list of slots on this bus */ 421 struct list_head slots; /* list of slots on this bus */
420 struct resource *resource[PCI_BRIDGE_RESOURCE_NUM]; 422 struct resource *resource[PCI_BRIDGE_RESOURCE_NUM];
421 struct list_head resources; /* address space routed to this bus */ 423 struct list_head resources; /* address space routed to this bus */
424 struct resource busn_res; /* bus numbers routed to this bus */
422 425
423 struct pci_ops *ops; /* configuration access functions */ 426 struct pci_ops *ops; /* configuration access functions */
424 void *sysdata; /* hook for sys-specific extension */ 427 void *sysdata; /* hook for sys-specific extension */
@@ -426,8 +429,6 @@ struct pci_bus {
426 429
427 unsigned char number; /* bus number */ 430 unsigned char number; /* bus number */
428 unsigned char primary; /* number of primary bridge */ 431 unsigned char primary; /* number of primary bridge */
429 unsigned char secondary; /* number of secondary bridge */
430 unsigned char subordinate; /* max number of subordinate buses */
431 unsigned char max_bus_speed; /* enum pci_bus_speed */ 432 unsigned char max_bus_speed; /* enum pci_bus_speed */
432 unsigned char cur_bus_speed; /* enum pci_bus_speed */ 433 unsigned char cur_bus_speed; /* enum pci_bus_speed */
433 434
@@ -668,6 +669,9 @@ struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata);
668struct pci_bus *pci_create_root_bus(struct device *parent, int bus, 669struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
669 struct pci_ops *ops, void *sysdata, 670 struct pci_ops *ops, void *sysdata,
670 struct list_head *resources); 671 struct list_head *resources);
672int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int busmax);
673int pci_bus_update_busn_res_end(struct pci_bus *b, int busmax);
674void pci_bus_release_busn_res(struct pci_bus *b);
671struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus, 675struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus,
672 struct pci_ops *ops, void *sysdata, 676 struct pci_ops *ops, void *sysdata,
673 struct list_head *resources); 677 struct list_head *resources);