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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
smp.c
diff --git
a/arch/powerpc/platforms/pseries/smp.c
b/arch/powerpc/platforms/pseries/smp.c
index
1672db2
..
4e44c4d
100644
(file)
--- a/
arch/powerpc/platforms/pseries/smp.c
+++ b/
arch/powerpc/platforms/pseries/smp.c
@@
-27,7
+27,7
@@
#include <linux/cpu.h>
#include <asm/ptrace.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/irq.h>
#include <asm/page.h>
#include <asm/pgtable.h>