diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-08-30 01:14:46 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-08-30 01:14:46 -0400 |
| commit | 9bb7361d99fb5c510e62b521e4292581fa1bee98 (patch) | |
| tree | f9a4797a2e97006947011fcdbf8677a84fbdf182 /arch/powerpc/include/asm | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
| parent | 9fcd768d0cc88b41ea459e25d2db12d3e25fa9dd (diff) | |
Merge remote-tracking branch 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/include/asm')
| -rw-r--r-- | arch/powerpc/include/asm/kexec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index 8a33698c61bd..f921eb121d39 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define _ASM_POWERPC_KEXEC_H | 2 | #define _ASM_POWERPC_KEXEC_H |
| 3 | #ifdef __KERNEL__ | 3 | #ifdef __KERNEL__ |
| 4 | 4 | ||
| 5 | #ifdef CONFIG_FSL_BOOKE | 5 | #if defined(CONFIG_FSL_BOOKE) || defined(CONFIG_44x) |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * On FSL-BookE we setup a 1:1 mapping which covers the first 2GiB of memory | 8 | * On FSL-BookE we setup a 1:1 mapping which covers the first 2GiB of memory |