diff options
Diffstat (limited to 'drivers/pci/setup-bus.c')
-rw-r--r-- | drivers/pci/setup-bus.c | 12 |
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) | |||
51 | struct resource_list head, *list, *tmp; | 51 | struct resource_list head, *list, *tmp; |
52 | int idx; | 52 | int idx; |
53 | 53 | ||
54 | bus->bridge_ctl &= ~PCI_BRIDGE_CTL_VGA; | ||
55 | |||
56 | head.next = NULL; | 54 | head.next = NULL; |
57 | list_for_each_entry(dev, &bus->devices, bus_list) { | 55 | list_for_each_entry(dev, &bus->devices, bus_list) { |
58 | u16 class = dev->class >> 8; | 56 | u16 class = dev->class >> 8; |
@@ -62,10 +60,6 @@ pbus_assign_resources_sorted(struct pci_bus *bus) | |||
62 | class == PCI_CLASS_BRIDGE_HOST) | 60 | class == PCI_CLASS_BRIDGE_HOST) |
63 | continue; | 61 | continue; |
64 | 62 | ||
65 | if (class == PCI_CLASS_DISPLAY_VGA || | ||
66 | class == PCI_CLASS_NOT_DEFINED_VGA) | ||
67 | bus->bridge_ctl |= PCI_BRIDGE_CTL_VGA; | ||
68 | |||
69 | pdev_sort_resources(dev, &head); | 63 | pdev_sort_resources(dev, &head); |
70 | } | 64 | } |
71 | 65 | ||
@@ -509,12 +503,6 @@ pci_bus_assign_resources(struct pci_bus *bus) | |||
509 | 503 | ||
510 | pbus_assign_resources_sorted(bus); | 504 | pbus_assign_resources_sorted(bus); |
511 | 505 | ||
512 | if (bus->bridge_ctl & PCI_BRIDGE_CTL_VGA) { | ||
513 | /* Propagate presence of the VGA to upstream bridges */ | ||
514 | for (b = bus; b->parent; b = b->parent) { | ||
515 | b->bridge_ctl |= PCI_BRIDGE_CTL_VGA; | ||
516 | } | ||
517 | } | ||
518 | list_for_each_entry(dev, &bus->devices, bus_list) { | 506 | list_for_each_entry(dev, &bus->devices, bus_list) { |
519 | b = dev->subordinate; | 507 | b = dev->subordinate; |
520 | if (!b) | 508 | if (!b) |