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/viro/vfs-2.6
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
smp_64.c
diff --git
a/arch/sparc/kernel/smp_64.c
b/arch/sparc/kernel/smp_64.c
index
99cb172
..
4a442c3
100644
(file)
--- a/
arch/sparc/kernel/smp_64.c
+++ b/
arch/sparc/kernel/smp_64.c
@@
-28,7
+28,7
@@
#include <asm/head.h>
#include <asm/ptrace.h>
#include <asm/head.h>
#include <asm/ptrace.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
#include <asm/cpudata.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
#include <asm/cpudata.h>