Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6] / include / asm-mips / kexec.h

diff --git a/include/asm-mips/kexec.h b/include/asm-mips/kexec.h
index b25267ebcb095c017f956ddcc9dda30025ea1e5b..4314892aaebb990572547d371dc5e2febde884ae 100644 (file)
--- a/include/asm-mips/kexec.h
+++ b/include/asm-mips/kexec.h
@@ -16,13 +16,11 @@
  /* Maximum address we can use for the control code buffer */
 #define KEXEC_CONTROL_MEMORY_LIMIT (0x20000000)
 
-#define KEXEC_CONTROL_CODE_SIZE 4096
+#define KEXEC_CONTROL_PAGE_SIZE 4096
 
 /* The native architecture */
 #define KEXEC_ARCH KEXEC_ARCH_MIPS
 
-#define MAX_NOTE_BYTES 1024
-
 static inline void crash_setup_regs(struct pt_regs *newregs,
                                    struct pt_regs *oldregs)
 {