[patch 2.6] PCI: undo recent pci_setup_bridge() change

[patch 2.6] PCI: undo recent pci_setup_bridge() change

[Ivan Kokshaysky]

That patch went into mainline by mistake - it was initial variant of a
fix for the problem with disabled P2P bridges. Which has already been
fixed properly in -test3.

Ivan.

--- 2.6/drivers/pci/setup-bus.c	Tue Aug 19 20:43:08 2003
+++ linux/drivers/pci/setup-bus.c	Wed Aug 20 02:03:49 2003
@@ -203,11 +203,6 @@ pci_setup_bridge(struct pci_bus *bus)
 	   Enable ISA in either case (FIXME!). */
 	l = (bus->resource[0]->flags & IORESOURCE_BUS_HAS_VGA) ? 0x0c : 0x04;
 	pci_write_config_word(bridge, PCI_BRIDGE_CONTROL, l);
-
-	/* Make sure the bridge COMMAND register has the appropriate
-	   bits set, just in case...
-	*/
-	pcibios_enable_device(bridge, 0xfff);
 }
 
 /* Check whether the bridge supports optional I/O and

Re: [patch 2.6] PCI: undo recent pci_setup_bridge() change

[Greg KH]

On Thu, Aug 21, 2003 at 02:40:44AM +0400, Ivan Kokshaysky wrote:
> That patch went into mainline by mistake - it was initial variant of a
> fix for the problem with disabled P2P bridges. Which has already been
> fixed properly in -test3.

Applied to my trees, and will send it on in a bit.

thanks,

greg k-h