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 /include | |
| parent | i915: make vbl interrupts work properly on i965g/gm hw. (diff) | |
| parent | [MIPS] Fix CONFIG_BUILD_ELF64 kernels with symbols in CKSEG0. (diff) | |
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 'include')
| -rw-r--r-- | include/asm-mips/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h index b92dd8c760da..e3301e54d559 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); \ |