From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Dec 2011 00:38:21 +0000 (+1100)
Subject: Merge remote-tracking branch 'pci/linux-next'
X-Git-Tag: next-20111221~74
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bb0dcde82a6004ab1067653440635972aa6e69b6;p=karo-tx-linux.git

Merge remote-tracking branch 'pci/linux-next'
---

bb0dcde82a6004ab1067653440635972aa6e69b6
diff --cc arch/arm/mach-mv78xx0/pcie.c
index 12fcb108b0e1,c701135f139e..8459f6d7d8ca
--- a/arch/arm/mach-mv78xx0/pcie.c
+++ b/arch/arm/mach-mv78xx0/pcie.c
@@@ -153,11 -153,10 +153,10 @@@ static int __init mv78xx0_pcie_setup(in
  	 * Generic PCIe unit setup.
  	 */
  	orion_pcie_set_local_bus_nr(pp->base, sys->busnr);
 -	orion_pcie_setup(pp->base, &mv78xx0_mbus_dram_info);
 +	orion_pcie_setup(pp->base);
  
- 	sys->resource[0] = &pp->res[0];
- 	sys->resource[1] = &pp->res[1];
- 	sys->resource[2] = NULL;
+ 	pci_add_resource(&sys->resources, &pp->res[0]);
+ 	pci_add_resource(&sys->resources, &pp->res[1]);
  
  	return 1;
  }