diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /arch/ppc/kernel/machine_kexec.c | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/ppc/kernel/machine_kexec.c')
| -rw-r--r-- | arch/ppc/kernel/machine_kexec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/machine_kexec.c b/arch/ppc/kernel/machine_kexec.c index 84d65a87191e..a469ba438cbe 100644 --- a/arch/ppc/kernel/machine_kexec.c +++ b/arch/ppc/kernel/machine_kexec.c | |||
| @@ -25,8 +25,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)( | |||
| 25 | unsigned long reboot_code_buffer, | 25 | unsigned long reboot_code_buffer, |
| 26 | unsigned long start_address) ATTRIB_NORET; | 26 | unsigned long start_address) ATTRIB_NORET; |
| 27 | 27 | ||
| 28 | const extern unsigned char relocate_new_kernel[]; | 28 | extern const unsigned char relocate_new_kernel[]; |
| 29 | const extern unsigned int relocate_new_kernel_size; | 29 | extern const unsigned int relocate_new_kernel_size; |
| 30 | 30 | ||
| 31 | void machine_shutdown(void) | 31 | void machine_shutdown(void) |
| 32 | { | 32 | { |