projects
/
oweals
/
u-boot.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.denx.de/u-boot
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
bitops.h
diff --git
a/arch/arm/include/asm/bitops.h
b/arch/arm/include/asm/bitops.h
index 879e20e0246c2ddfa7eab8dd26a4a91b3943e4b2..597dafbf9d26fadcb27dce69cf03df2dd08ca44b 100644
(file)
--- a/
arch/arm/include/asm/bitops.h
+++ b/
arch/arm/include/asm/bitops.h
@@
-17,7
+17,7
@@
#ifdef __KERNEL__
-#include <asm/proc/system.h>
+#include <asm/proc
-armv
/system.h>
#define smp_mb__before_clear_bit() do { } while (0)
#define smp_mb__after_clear_bit() do { } while (0)