diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-27 19:47:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-27 19:47:53 -0700 |
| commit | cdfef17d93b35a6d583509945e699ee998abce24 (patch) | |
| tree | 2d03d40d14641a2ad6a4269dabc66663fc072e0f | |
| parent | e4a7b1d1d90d202a030688ab5b177c3c0f15ee3e (diff) | |
| parent | 7d809ba3f98b8aa8f9ba0dcdf6349958a0b77b7b (diff) | |
| download | op-kernel-dev-cdfef17d93b35a6d583509945e699ee998abce24.zip op-kernel-dev-cdfef17d93b35a6d583509945e699ee998abce24.tar.gz | |
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.
| -rw-r--r-- | arch/mips/sgi-ip32/ip32-platform.c | 4 | ||||
| -rw-r--r-- | include/asm-mips/page.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c index ba3697e..7309e48 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); } diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h index b92dd8c..e3301e5 100644 --- a/include/asm-mips/page.h +++ b/include/asm-mips/page.h @@ -142,7 +142,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; /* * __pa()/__va() should be used only during mem init. */ -#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64) +#ifdef CONFIG_64BIT #define __pa(x) \ ({ \ unsigned long __x = (unsigned long)(x); \ |
