diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /arch/ppc/syslib/mpc52xx_pci.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'arch/ppc/syslib/mpc52xx_pci.c')
| -rw-r--r-- | arch/ppc/syslib/mpc52xx_pci.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/ppc/syslib/mpc52xx_pci.c b/arch/ppc/syslib/mpc52xx_pci.c index c723efd954a6..59cf3e8bd1a0 100644 --- a/arch/ppc/syslib/mpc52xx_pci.c +++ b/arch/ppc/syslib/mpc52xx_pci.c | |||
| @@ -205,13 +205,11 @@ mpc52xx_find_bridges(void) | |||
| 205 | 205 | ||
| 206 | hose->pci_mem_offset = MPC52xx_PCI_MEM_OFFSET; | 206 | hose->pci_mem_offset = MPC52xx_PCI_MEM_OFFSET; |
| 207 | 207 | ||
| 208 | isa_io_base = | 208 | hose->io_base_virt = ioremap(MPC52xx_PCI_IO_BASE, MPC52xx_PCI_IO_SIZE); |
| 209 | (unsigned long) ioremap(MPC52xx_PCI_IO_BASE, | 209 | isa_io_base = (unsigned long) hose->io_base_virt; |
| 210 | MPC52xx_PCI_IO_SIZE); | ||
| 211 | hose->io_base_virt = (void *) isa_io_base; | ||
| 212 | 210 | ||
| 213 | hose->cfg_addr = &pci_regs->car; | 211 | hose->cfg_addr = &pci_regs->car; |
| 214 | hose->cfg_data = (void __iomem *) isa_io_base; | 212 | hose->cfg_data = hose->io_base_virt; |
| 215 | 213 | ||
| 216 | /* Setup resources */ | 214 | /* Setup resources */ |
| 217 | pci_init_resource(&hose->mem_resources[0], | 215 | pci_init_resource(&hose->mem_resources[0], |