diff --git a/[refs] b/[refs] index c886f3408c05..f74d6bfa3e21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d99f524234c2e772eea68ad019ec9c805991f23 +refs/heads/master: 67cdc827286366acb6c60c821013c1185ee00b36 diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index 6258f6f24983..68e75cb0831b 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/drivers/pci/probe.c @@ -16,6 +16,13 @@ #define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */ #define CARDBUS_RESERVE_BUSNR 3 +struct resource busn_resource = { + .name = "PCI busn", + .start = 0, + .end = 255, + .flags = IORESOURCE_BUS, +}; + /* Ugh. Need to stop exporting this to modules. */ LIST_HEAD(pci_root_buses); EXPORT_SYMBOL(pci_root_buses); diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index c4df570f3bbb..8c8b44d62105 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -368,6 +368,8 @@ static inline int pci_channel_offline(struct pci_dev *pdev) return (pdev->error_state != pci_channel_io_normal); } +extern struct resource busn_resource; + struct pci_host_bridge_window { struct list_head list; struct resource *res; /* host bridge aperture (CPU address) */