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-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
arch
/
tile
/
include
/
asm
/
bitops_32.h
diff --git
a/arch/tile/include/asm/bitops_32.h
b/arch/tile/include/asm/bitops_32.h
index
d31ab90
..
571b118
100644
(file)
--- a/
arch/tile/include/asm/bitops_32.h
+++ b/
arch/tile/include/asm/bitops_32.h
@@
-16,7
+16,7
@@
#define _ASM_TILE_BITOPS_32_H
#include <linux/compiler.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/system.h>
/* Tile-specific routines to support <asm/bitops.h>. */