From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 30 May 2014 17:41:17 +0000 (-0600)
Subject: Merge branches 'pci/host-exynos', 'pci/host-imx6', 'pci/resource' and 'pci/misc'... 
X-Git-Tag: next-20140604~71^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=617b4157a5c82ab3e9509aa388bfd3d47e0e623a;p=karo-tx-linux.git

Merge branches 'pci/host-exynos', 'pci/host-imx6', 'pci/resource' and 'pci/misc' into next

* pci/host-exynos:
  PCI: exynos: Fix add_pcie_port() section mismatch warning

* pci/host-imx6:
  PCI: imx6: Add support for MSI
  PCI: designware: Make MSI ISR shared IRQ aware
  PCI: imx6: Remove optional (and unused) IRQs
  PCI: imx6: Drop old IRQ mapping
  PCI: imx6: Use new clock names
  PCI: imx6: Fix imx6_add_pcie_port() section mismatch warning

* pci/resource:
  i82875p_edac: Assign PCI resources before adding device

* pci/misc:
  ARM/PCI: Call pcie_bus_configure_settings() to set MPS
  PCI: Make pci_bus_add_device() void

Conflicts:
	drivers/edac/i82875p_edac.c
---

617b4157a5c82ab3e9509aa388bfd3d47e0e623a
diff --cc drivers/edac/i82875p_edac.c
index 8d0450b9b9af,8d0450b9b9af,8d0450b9b9af,f2b9ac9ed9f3,4009077c8839..64b68320249f
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@@@@@ -293,13 -293,13 -293,13 -293,14 -292,8 +292,8 @@@@@@ static int i82875p_setup_overfl_dev(str
     		if (dev == NULL)
     			return 1;
     
---  		err = pci_bus_add_device(dev);
---  		if (err) {
---  			i82875p_printk(KERN_ERR,
---  				"%s(): pci_bus_add_device() Failed\n",
---  				__func__);
---  		}
    -		pci_bus_add_device(dev);
     		pci_bus_assign_resources(dev->bus);
   - 
   - 		err = pci_bus_add_device(dev);
   - 		if (err) {
   - 			i82875p_printk(KERN_ERR,
   - 				"%s(): pci_bus_add_device() Failed\n",
   - 				__func__);
   - 		}
+++++		pci_bus_add_device(dev);
     	}
     
     	*ovrfl_pdev = dev;