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 'next/fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux...
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
spinlock.h
diff --git
a/arch/ia64/include/asm/spinlock.h
b/arch/ia64/include/asm/spinlock.h
index
1a91c91
..
b77768d
100644
(file)
--- a/
arch/ia64/include/asm/spinlock.h
+++ b/
arch/ia64/include/asm/spinlock.h
@@
-13,7
+13,7
@@
#include <linux/kernel.h>
#include <linux/bitops.h>
#include <linux/kernel.h>
#include <linux/bitops.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/intrinsics.h>
#include <asm/system.h>
#include <asm/intrinsics.h>
#include <asm/system.h>