/spare/repo/netdev-2.6 branch 'master'

1 files changed, 0 insertions, 12 deletions

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 9fe48f712be9..a2eebc6eaacc 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -51,8 +51,6 @@ pbus_assign_resources_sorted(struct pci_bus *bus)
         struct resource_list head, *list, *tmp;
         int idx;
 
-        bus->bridge_ctl &= ~PCI_BRIDGE_CTL_VGA;
-
         head.next = NULL;
         list_for_each_entry(dev, &bus->devices, bus_list) {
                 u16 class = dev->class >> 8;
@@ -62,10 +60,6 @@ pbus_assign_resources_sorted(struct pci_bus *bus)
                     class == PCI_CLASS_BRIDGE_HOST)
                         continue;
 
-                if (class == PCI_CLASS_DISPLAY_VGA ||
-                    class == PCI_CLASS_NOT_DEFINED_VGA)
-                        bus->bridge_ctl |= PCI_BRIDGE_CTL_VGA;
-
                 pdev_sort_resources(dev, &head);
         }
 
@@ -509,12 +503,6 @@ pci_bus_assign_resources(struct pci_bus *bus)
 
         pbus_assign_resources_sorted(bus);
 
-        if (bus->bridge_ctl & PCI_BRIDGE_CTL_VGA) {
-                /* Propagate presence of the VGA to upstream bridges */
-                for (b = bus; b->parent; b = b->parent) {
-                        b->bridge_ctl |= PCI_BRIDGE_CTL_VGA;
-                }
-        }
         list_for_each_entry(dev, &bus->devices, bus_list) {
                 b = dev->subordinate;
                 if (!b)