diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 15:35:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 15:35:04 -0700 |
| commit | 863da9557e5ad2874f3fc6f350b392e03f983ca4 (patch) | |
| tree | 9dd7964242933d7b761f1aee045e3a417283155c /arch/mips/pci/pci-yosemite.c | |
| parent | 5620ae29f1eabe655f44335231b580a78c8364ea (diff) | |
| parent | 8faf2e6c201d95b780cd3b4674b7a55ede6dcbbb (diff) | |
| download | linux-863da9557e5ad2874f3fc6f350b392e03f983ca4.tar.bz2 | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
MIPS: Set io_map_base for several PCI bridges lacking it
MIPS: Alchemy: Define eth platform devices in the correct order
MIPS: BCM63xx: Prevent second enet registration on BCM6338
MIPS: Quit using undefined behavior of ADDU in 64-bit atomic operations.
MIPS: N32: Define getdents64.
MIPS: MTX-1: Fix PCI on the MeshCube and related boards
MIPS: Make init_vdso a subsys_initcall.
MIPS: "Fix" useless 'init_vdso successfully' message.
MIPS: PowerTV: Move register setup to before reading registers.
SOUND: Au1000: Fix section mismatch
VIDEO: Au1100fb: Fix section mismatch
VIDEO: PMAGB-B: Fix section mismatch
VIDEO: PMAG-BA: Fix section mismatch
NET: declance: Fix section mismatches
VIDEO. gbefb: Fix section mismatches.
Diffstat (limited to 'arch/mips/pci/pci-yosemite.c')
| -rw-r--r-- | arch/mips/pci/pci-yosemite.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/pci/pci-yosemite.c b/arch/mips/pci/pci-yosemite.c index 0357946f30e6..cf5e1a25cb7d 100644 --- a/arch/mips/pci/pci-yosemite.c +++ b/arch/mips/pci/pci-yosemite.c @@ -54,6 +54,7 @@ static int __init pmc_yosemite_setup(void) panic(ioremap_failed); set_io_port_base(io_v_base); + py_controller.io_map_base = io_v_base; TITAN_WRITE(RM9000x2_OCD_LKM7, TITAN_READ(RM9000x2_OCD_LKM7) | 1); ioport_resource.end = TITAN_IO_SIZE - 1; |