diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
| commit | 4944dd62de21230af039eda7cd218e9a09021d11 (patch) | |
| tree | bac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /arch/powerpc/include/asm/page.h | |
| parent | f17845e5d97ead8fbdadfd40039e058ec7cf4a42 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'arch/powerpc/include/asm/page.h')
| -rw-r--r-- | arch/powerpc/include/asm/page.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index 5ac51e6efc1d..c0b8d4a29a91 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h | |||
| @@ -77,6 +77,7 @@ | |||
| 77 | 77 | ||
| 78 | #if defined(CONFIG_RELOCATABLE) | 78 | #if defined(CONFIG_RELOCATABLE) |
| 79 | #ifndef __ASSEMBLY__ | 79 | #ifndef __ASSEMBLY__ |
| 80 | |||
| 80 | extern phys_addr_t memstart_addr; | 81 | extern phys_addr_t memstart_addr; |
| 81 | extern phys_addr_t kernstart_addr; | 82 | extern phys_addr_t kernstart_addr; |
| 82 | #endif | 83 | #endif |