diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /include/asm-ia64/kexec.h | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'include/asm-ia64/kexec.h')
| -rw-r--r-- | include/asm-ia64/kexec.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-ia64/kexec.h b/include/asm-ia64/kexec.h index f2ad469a6ddf..41299ddfee30 100644 --- a/include/asm-ia64/kexec.h +++ b/include/asm-ia64/kexec.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | } while(0) | 22 | } while(0) |
| 23 | 23 | ||
| 24 | extern struct kimage *ia64_kimage; | 24 | extern struct kimage *ia64_kimage; |
| 25 | DECLARE_PER_CPU(u64, ia64_mca_pal_base); | ||
| 26 | extern const unsigned int relocate_new_kernel_size; | 25 | extern const unsigned int relocate_new_kernel_size; |
| 27 | extern void relocate_new_kernel(unsigned long, unsigned long, | 26 | extern void relocate_new_kernel(unsigned long, unsigned long, |
| 28 | struct ia64_boot_param *, unsigned long); | 27 | struct ia64_boot_param *, unsigned long); |