diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-22 03:45:50 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-22 03:45:50 +0100 |
| commit | 8559840c4ca3f2fff73a882803bc8916078fac1f (patch) | |
| tree | e41f722a478d2e9f199398d4a766b004fd451ebc /arch/ia64/sn/kernel/setup.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | [IA64] Fix wrong /proc/iomem on SGI Altix (diff) | |
| download | linux-8559840c4ca3f2fff73a882803bc8916078fac1f.tar.xz linux-8559840c4ca3f2fff73a882803bc8916078fac1f.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix wrong /proc/iomem on SGI Altix
[IA64] Altix: ioremap vga_console_iobase
[IA64] Fix typo/thinko in crash.c
[IA64] Fix get_model_name() for mixed cpu type systems
[IA64] min_low_pfn and max_low_pfn calculation fix
Diffstat (limited to 'arch/ia64/sn/kernel/setup.c')
| -rw-r--r-- | arch/ia64/sn/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index bd5373d593e1..a9bed5ca2ed8 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c @@ -348,8 +348,7 @@ sn_scan_pcdp(void) continue; /* not PCI interconnect */ if (if_pci.translation & PCDP_PCI_TRANS_IOPORT) - vga_console_iobase = - if_pci.ioport_tra | __IA64_UNCACHED_OFFSET; + vga_console_iobase = if_pci.ioport_tra; if (if_pci.translation & PCDP_PCI_TRANS_MMIO) vga_console_membase = @@ -429,7 +428,8 @@ void __init sn_setup(char **cmdline_p) * bus containing the VGA console. */ if (vga_console_iobase) { - io_space[0].mmio_base = vga_console_iobase; + io_space[0].mmio_base = + (unsigned long) ioremap(vga_console_iobase, 0); io_space[0].sparse = 0; } |