Merge with /home/shaggy/git/linus-clean/

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index df3bdae2040f..93e8a878ea95 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -507,7 +507,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
                 pci_write_config_dword(dev, PCI_PRIMARY_BUS, buses);
 
                 if (!is_cardbus) {
-                        child->bridge_ctl = PCI_BRIDGE_CTL_NO_ISA;
+                        child->bridge_ctl = bctl | PCI_BRIDGE_CTL_NO_ISA;
                         /*
                          * Adjust subordinate busnr in parent buses.
                          * We do this before scanning for children because