diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 06:59:32 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 06:59:37 -0400 |
commit | 7961386fe9596e6bf03d09948a73c5df9653325b (patch) | |
tree | 60fa2586a0d340ef8f7473956eef17430d8250c7 /include/asm-frv/mutex.h | |
parent | aa47b7e0f89b9998dad4d1667447e8cb7703ff4e (diff) | |
parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) |
Merge commit 'v2.6.30-rc5' into sched/core
Merge reason: sched/core was on .30-rc1 before, update to latest fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-frv/mutex.h')
-rw-r--r-- | include/asm-frv/mutex.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/asm-frv/mutex.h b/include/asm-frv/mutex.h deleted file mode 100644 index 458c1f7fbc18..000000000000 --- a/include/asm-frv/mutex.h +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | /* | ||
2 | * Pull in the generic implementation for the mutex fastpath. | ||
3 | * | ||
4 | * TODO: implement optimized primitives instead, or leave the generic | ||
5 | * implementation in place, or pick the atomic_xchg() based generic | ||
6 | * implementation. (see asm-generic/mutex-xchg.h for details) | ||
7 | */ | ||
8 | |||
9 | #include <asm-generic/mutex-dec.h> | ||