diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /arch/sh/drivers/pci/fixups-dreamcast.c | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'arch/sh/drivers/pci/fixups-dreamcast.c')
| -rw-r--r-- | arch/sh/drivers/pci/fixups-dreamcast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c index ed7f489936f1..942ef4f155f5 100644 --- a/arch/sh/drivers/pci/fixups-dreamcast.c +++ b/arch/sh/drivers/pci/fixups-dreamcast.c | |||
| @@ -39,7 +39,7 @@ static void __init gapspci_fixup_resources(struct pci_dev *dev) | |||
| 39 | /* | 39 | /* |
| 40 | * We also assume that dev->devfn == 0 | 40 | * We also assume that dev->devfn == 0 |
| 41 | */ | 41 | */ |
| 42 | dev->resource[1].start = p->io_resource->start + 0x100; | 42 | dev->resource[1].start = p->resources[0].start + 0x100; |
| 43 | dev->resource[1].end = dev->resource[1].start + 0x200 - 1; | 43 | dev->resource[1].end = dev->resource[1].start + 0x200 - 1; |
| 44 | 44 | ||
| 45 | /* | 45 | /* |