Merge master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / drivers / pci / setup-bus.c

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 170a3eda9dd3351519acf9dde1b388b66220c663..8d9da9d30a61ffcd058c352f22cc6baab8f9e9a4 100644 (file)
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -144,6 +144,9 @@ static void pci_setup_bridge(struct pci_bus *bus)
        struct pci_bus_region region;
        u32 l, bu, lu, io_upper16;
 
+       if (pci_is_enabled(bridge))
+               return;
+
        dev_info(&bridge->dev, "PCI bridge, secondary bus %04x:%02x\n",
                 pci_domain_nr(bus), bus->number);