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/horms/ipvs-2.6
[pandora-kernel.git]
/
arch
/
blackfin
/
include
/
asm
/
ipipe.h
diff --git
a/arch/blackfin/include/asm/ipipe.h
b/arch/blackfin/include/asm/ipipe.h
index
9e0cc0e
..
17b5e92
100644
(file)
--- a/
arch/blackfin/include/asm/ipipe.h
+++ b/
arch/blackfin/include/asm/ipipe.h
@@
-32,7
+32,7
@@
#include <asm/ptrace.h>
#include <asm/irq.h>
#include <asm/bitops.h>
#include <asm/ptrace.h>
#include <asm/irq.h>
#include <asm/bitops.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/traps.h>
#include <asm/bitsperlong.h>
#include <asm/traps.h>
#include <asm/bitsperlong.h>