Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[karo-tx-linux.git] / arch / mips / pci / pcie-octeon.c

diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
index 1bb0b2bf8d6ea1e411266fd3d8de6a5afc50fba0..99f3db4f0a9b1b060476e6d5873fd45dd15a649b 100644 (file)
--- a/arch/mips/pci/pcie-octeon.c
+++ b/arch/mips/pci/pcie-octeon.c
@@ -1762,14 +1762,6 @@ static int octeon_pcie_write_config(unsigned int pcie_port, struct pci_bus *bus,
        default:
                return PCIBIOS_FUNC_NOT_SUPPORTED;
        }
-#if PCI_CONFIG_SPACE_DELAY
-       /*
-        * Delay on writes so that devices have time to come up. Some
-        * bridges need this to allow time for the secondary busses to
-        * work
-        */
-       udelay(PCI_CONFIG_SPACE_DELAY);
-#endif
        return PCIBIOS_SUCCESSFUL;
 }