From adc10df03b6a35388c2ce7fc6b359ceff8330dd1 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Sun, 11 Sep 2011 14:08:38 -0300 Subject: [PATCH] --- yaml --- r: 270314 b: refs/heads/master c: e24442733ee486c99d03fe2ecd98924d1bc14c51 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/setup-bus.c | 2 +- trunk/include/linux/pci.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1bb50028445b..67316c40dd81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72da0b07b1b497927758a2102b856ce41e4ba81e +refs/heads/master: e24442733ee486c99d03fe2ecd98924d1bc14c51 diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c index 784da9d36029..86b69f85f900 100644 --- a/trunk/drivers/pci/setup-bus.c +++ b/trunk/drivers/pci/setup-bus.c @@ -426,7 +426,7 @@ static void __pci_setup_bridge(struct pci_bus *bus, unsigned long type) pci_write_config_word(bridge, PCI_BRIDGE_CONTROL, bus->bridge_ctl); } -static void pci_setup_bridge(struct pci_bus *bus) +void pci_setup_bridge(struct pci_bus *bus) { unsigned long type = IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH; diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index 9fc01226055b..4ff6d4e9455c 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -955,6 +955,7 @@ void pci_walk_bus(struct pci_bus *top, int (*cb)(struct pci_dev *, void *), int pci_cfg_space_size_ext(struct pci_dev *dev); int pci_cfg_space_size(struct pci_dev *dev); unsigned char pci_bus_max_busnr(struct pci_bus *bus); +void pci_setup_bridge(struct pci_bus *bus); #define PCI_VGA_STATE_CHANGE_BRIDGE (1 << 0) #define PCI_VGA_STATE_CHANGE_DECODES (1 << 1)