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 'topic/hdsp' into for-linus
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
cputable.c
diff --git
a/arch/powerpc/kernel/cputable.c
b/arch/powerpc/kernel/cputable.c
index
f9c40f8
..
3e33fb9
100644
(file)
--- a/
arch/powerpc/kernel/cputable.c
+++ b/
arch/powerpc/kernel/cputable.c
@@
-1836,7
+1836,7
@@
static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s)
* and, in that case, keep the current value for
* oprofile_cpu_type.
*/
- if (old.oprofile_cpu_type
=
= NULL) {
+ if (old.oprofile_cpu_type
!
= NULL) {
t->oprofile_cpu_type = old.oprofile_cpu_type;
t->oprofile_type = old.oprofile_type;
}