summaryrefslogtreecommitdiff
path: root/arch/mips/pci/pci-yosemite.c
diff options
context:
space:
mode:
authorAlex Elder <aelder@sgi.com>2010-08-02 19:24:57 +0400
committerAlex Elder <aelder@sgi.com>2010-08-02 19:24:57 +0400
commit6b0a2996a0c023d84bc27ec7528a6e54cb5ea264 (patch)
tree9fa9a85d5d871b3cb3c28daf57d8ef8f05becd66 /arch/mips/pci/pci-yosemite.c
parent209fb87a259ead17e966627b7f053d16a96898da (diff)
parent9fe6206f400646a2322096b56c59891d530e8d51 (diff)
downloadlinux-6b0a2996a0c023d84bc27ec7528a6e54cb5ea264.tar.xz
Merge branch 'v2.6.35'
Diffstat (limited to 'arch/mips/pci/pci-yosemite.c')
-rw-r--r--arch/mips/pci/pci-yosemite.c1
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;