diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 04:47:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 04:47:53 +0200 |
| commit | cdfef17d93b35a6d583509945e699ee998abce24 (patch) | |
| tree | 2d03d40d14641a2ad6a4269dabc66663fc072e0f /arch | |
| parent | i915: make vbl interrupts work properly on i965g/gm hw. (diff) | |
| parent | [MIPS] Fix CONFIG_BUILD_ELF64 kernels with symbols in CKSEG0. (diff) | |
| download | linux-cdfef17d93b35a6d583509945e699ee998abce24.tar.xz linux-cdfef17d93b35a6d583509945e699ee998abce24.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix CONFIG_BUILD_ELF64 kernels with symbols in CKSEG0.
[MIPS] IP32: Fix initialization of UART base addresses.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/sgi-ip32/ip32-platform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c index ba3697ee7ff6..7309e48d163d 100644 --- a/arch/mips/sgi-ip32/ip32-platform.c +++ b/arch/mips/sgi-ip32/ip32-platform.c @@ -41,8 +41,8 @@ static struct platform_device uart8250_device = { static int __init uart8250_init(void) { - uart8250_data[0].iobase = (unsigned long) &mace->isa.serial1; - uart8250_data[1].iobase = (unsigned long) &mace->isa.serial1; + uart8250_data[0].membase = (void __iomem *) &mace->isa.serial1; + uart8250_data[1].membase = (void __iomem *) &mace->isa.serial1; return platform_device_register(&uart8250_device); } |