Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

[sfrench/cifs-2.6.git] / include / asm-ia64 / kexec.h

diff --git a/include/asm-ia64/kexec.h b/include/asm-ia64/kexec.h
index 01c36b0047474c7272a863a5610ad443078c8a20..41299ddfee30e0c742102420725e3645bd711999 100644 (file)
--- a/include/asm-ia64/kexec.h
+++ b/include/asm-ia64/kexec.h
@@ -22,8 +22,7 @@
         } while(0)
 
 extern struct kimage *ia64_kimage;
-DECLARE_PER_CPU(u64, ia64_mca_pal_base);
-const extern unsigned int relocate_new_kernel_size;
+extern const unsigned int relocate_new_kernel_size;
 extern void relocate_new_kernel(unsigned long, unsigned long,
                struct ia64_boot_param *, unsigned long);
 static inline void