diff options
Diffstat (limited to 'arch/arm/mach-ixp4xx/common-pci.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/common-pci.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c index 8325058ef87..5eff15f24bc 100644 --- a/arch/arm/mach-ixp4xx/common-pci.c +++ b/arch/arm/mach-ixp4xx/common-pci.c @@ -472,9 +472,8 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)  	request_resource(&ioport_resource, &res[0]);  	request_resource(&iomem_resource, &res[1]); -	sys->resource[0] = &res[0]; -	sys->resource[1] = &res[1]; -	sys->resource[2] = NULL; +	pci_add_resource(&sys->resources, &res[0]); +	pci_add_resource(&sys->resources, &res[1]);  	platform_notify = ixp4xx_pci_platform_notify;  	platform_notify_remove = ixp4xx_pci_platform_notify_remove; @@ -484,7 +483,8 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)  struct pci_bus * __devinit ixp4xx_scan_bus(int nr, struct pci_sys_data *sys)  { -	return pci_scan_bus(sys->busnr, &ixp4xx_ops, sys); +	return pci_scan_root_bus(NULL, sys->busnr, &ixp4xx_ops, sys, +				 &sys->resources);  }  int dma_set_coherent_mask(struct device *dev, u64 mask)  |