git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
efi.c
diff --git
a/arch/ia64/kernel/efi.c
b/arch/ia64/kernel/efi.c
index
51b75ce
..
efaff15
100644
(file)
--- a/
arch/ia64/kernel/efi.c
+++ b/
arch/ia64/kernel/efi.c
@@
-1335,7
+1335,7
@@
kdump_find_rsvd_region (unsigned long size, struct rsvd_region *r, int n)
}
#endif
-#ifdef CONFIG_
PROC_VMCORE
+#ifdef CONFIG_
CRASH_DUMP
/* locate the size find a the descriptor at a certain address */
unsigned long __init
vmcore_find_descriptor_size (unsigned long address)