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 'linus' into core/urgent
[linux-2.6-block.git]
/
include
/
linux
/
mutex.h
diff --git
a/include/linux/mutex.h
b/include/linux/mutex.h
index 7f87217e9d1f65dd50ebcfd98e08391d7f65a7d2..9121595a8ebfe14a1d2330c79454f4b53a088669 100644
(file)
--- a/
include/linux/mutex.h
+++ b/
include/linux/mutex.h
@@
-15,7
+15,7
@@
#include <linux/linkage.h>
#include <linux/lockdep.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
/*
* Simple, straightforward mutexes with strict semantics: