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/geert/linux...
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
smp.c
diff --git
a/arch/alpha/kernel/smp.c
b/arch/alpha/kernel/smp.c
index
d739703
..
4087a56
100644
(file)
--- a/
arch/alpha/kernel/smp.c
+++ b/
arch/alpha/kernel/smp.c
@@
-31,7
+31,7
@@
#include <asm/hwrpb.h>
#include <asm/ptrace.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/io.h>
#include <asm/irq.h>