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.dk/linux-block
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
misc_32.S
diff --git
a/arch/powerpc/kernel/misc_32.S
b/arch/powerpc/kernel/misc_32.S
index
f7d760a
..
7cd07b4
100644
(file)
--- a/
arch/powerpc/kernel/misc_32.S
+++ b/
arch/powerpc/kernel/misc_32.S
@@
-738,7
+738,7
@@
relocate_new_kernel:
mr r5, r31
li r0, 0
-#elif defined(CONFIG_44x) && !defined(CONFIG_47x)
+#elif defined(CONFIG_44x) && !defined(CONFIG_
PPC_
47x)
/*
* Code for setting up 1:1 mapping for PPC440x for KEXEC