diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-24 14:25:33 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-24 14:25:33 -0800 |
| commit | ecd58d667a6ac4350d2f67b9accaadf575bae4b0 (patch) | |
| tree | 5209771a0a1f61820171e444d3e4a580ecf3955f /arch/arm/common/it8152.c | |
| parent | b07f2ebc109b607789f648dedcff4b125f9afec6 (diff) | |
| parent | fb127cb9de791d62fb393d6e65fa9869bddd2460 (diff) | |
Merge branch 'pci-next+probe_only+bus2res-fb127cb' of git://github.com/bjorn-helgaas/linux into linux-next
Diffstat (limited to 'arch/arm/common/it8152.c')
| -rw-r--r-- | arch/arm/common/it8152.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c index d1bcd7b13eb..9384c2d02ba 100644 --- a/arch/arm/common/it8152.c +++ b/arch/arm/common/it8152.c @@ -299,8 +299,8 @@ int __init it8152_pci_setup(int nr, struct pci_sys_data *sys) goto err1; } - pci_add_resource(&sys->resources, &it8152_io); - pci_add_resource(&sys->resources, &it8152_mem); + pci_add_resource_offset(&sys->resources, &it8152_io, sys->io_offset); + pci_add_resource_offset(&sys->resources, &it8152_mem, sys->mem_offset); if (platform_notify || platform_notify_remove) { printk(KERN_ERR "PCI: Can't use platform_notify\n"); |