Merge tag 'v3.16-rc1' into i2c/for-next

[karo-tx-linux.git] / drivers / pci / host / pci-exynos.c

diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c
index 1632661c5b7f693dfe41a4157feba9672f9500c2..c5d0ca3845028d65e1476ea2e279a70beb6a7049 100644 (file)
--- a/drivers/pci/host/pci-exynos.c
+++ b/drivers/pci/host/pci-exynos.c
@@ -545,7 +545,6 @@ static int __init add_pcie_port(struct pcie_port *pp,
        pp->root_bus_nr = -1;
        pp->ops = &exynos_pcie_host_ops;
 
-       spin_lock_init(&pp->conf_lock);
        ret = dw_pcie_host_init(pp);
        if (ret) {
                dev_err(&pdev->dev, "failed to initialize host\n");