projects
/
linux-flexiantxendom0-3.2.10.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
[linux-flexiantxendom0-3.2.10.git]
/
arch
/
arm
/
kernel
/
machine_kexec.c
diff --git
a/arch/arm/kernel/machine_kexec.c
b/arch/arm/kernel/machine_kexec.c
index
a300044
..
dfcdb9f
100644
(file)
--- a/
arch/arm/kernel/machine_kexec.c
+++ b/
arch/arm/kernel/machine_kexec.c
@@
-13,7
+13,7
@@
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
#include <asm/mach-types.h>
-#include <asm/system.h>
+#include <asm/system_misc.h>
extern const unsigned char relocate_new_kernel[];
extern const unsigned int relocate_new_kernel_size;