diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-02 08:29:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-02 08:31:54 +0200 |
| commit | 3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01 (patch) | |
| tree | a1a8cc85948c086aa12a1d8014151a7ca7c04ea8 /arch/mips/pci/pci-yosemite.c | |
| parent | Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/fre... (diff) | |
| parent | Linux 2.6.35 (diff) | |
| download | linux-3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01.tar.xz linux-3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01.zip | |
Merge commit 'v2.6.35' into perf/core
Conflicts:
tools/perf/Makefile
tools/perf/util/hist.c
Merge reason: Resolve the conflicts and update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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; |