diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-08-30 07:14:46 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-08-30 07:14:46 +0200 |
| commit | 9bb7361d99fb5c510e62b521e4292581fa1bee98 (patch) | |
| tree | f9a4797a2e97006947011fcdbf8677a84fbdf182 /arch/powerpc/include | |
| parent | Linux 3.1-rc4 (diff) | |
| parent | powerpc/40x: Remove obsolete HCU4 board (diff) | |
| download | linux-9bb7361d99fb5c510e62b521e4292581fa1bee98.tar.xz linux-9bb7361d99fb5c510e62b521e4292581fa1bee98.zip | |
Merge remote-tracking branch 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/include')
| -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 @@ #define _ASM_POWERPC_KEXEC_H #ifdef __KERNEL__ -#ifdef CONFIG_FSL_BOOKE +#if defined(CONFIG_FSL_BOOKE) || defined(CONFIG_44x) /* * On FSL-BookE we setup a 1:1 mapping which covers the first 2GiB of memory |