Merge master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 32110cede64fd23554f1c8c5a24233d5a63f14ab..17f76fc0517377094cf318a544eb55b2e8eaeb56 100644 (file)
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -25,8 +25,8 @@
 #error KEXEC_CONTROL_MEMORY_LIMIT not defined
 #endif
 
-#ifndef KEXEC_CONTROL_CODE_SIZE
-#error KEXEC_CONTROL_CODE_SIZE not defined
+#ifndef KEXEC_CONTROL_PAGE_SIZE
+#error KEXEC_CONTROL_PAGE_SIZE not defined
 #endif
 
 #ifndef KEXEC_ARCH