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 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
smpboot.c
diff --git
a/arch/ia64/kernel/smpboot.c
b/arch/ia64/kernel/smpboot.c
index
14ec641
..
5590979
100644
(file)
--- a/
arch/ia64/kernel/smpboot.c
+++ b/
arch/ia64/kernel/smpboot.c
@@
-40,7
+40,7
@@
#include <linux/percpu.h>
#include <linux/bitops.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/cache.h>
#include <asm/current.h>
#include <asm/delay.h>