projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'regmap-linus' into regmap-next
[linux-2.6-block.git]
/
include
/
linux
/
spinlock.h
diff --git
a/include/linux/spinlock.h
b/include/linux/spinlock.h
index 0b22d51258e6839f3a7727e38ac09a994757b446..7df6c17b0281867241ffa64de8429f6ff84d5d17 100644
(file)
--- a/
include/linux/spinlock.h
+++ b/
include/linux/spinlock.h
@@
-384,7
+384,7
@@
static inline void assert_spin_locked(spinlock_t *lock)
* Pull the atomic_t declaration:
* (asm-mips/atomic.h needs above definitions)
*/
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
/**
* atomic_dec_and_lock - lock on reaching reference count zero
* @atomic: the atomic counter