diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 12:50:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 12:50:54 -0800 |
| commit | c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1 (patch) | |
| tree | f0ba7e8b50a4f103caa1c5033d30375c2d1dd5ed /include | |
| parent | 6ccce2b32900a8a6f481036e0cbbfe174742352c (diff) | |
| parent | fdcb23634c9b6649bb02c681033d4973491b0e35 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
hwspinlock/u8500: fix build error due to undefined label
hwspinlock: Don't return a value in __hwspin_unlock
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hwspinlock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/hwspinlock.h b/include/linux/hwspinlock.h index 08a2fee4065..aad6bd4b3ef 100644 --- a/include/linux/hwspinlock.h +++ b/include/linux/hwspinlock.h @@ -118,7 +118,6 @@ int __hwspin_trylock(struct hwspinlock *hwlock, int mode, unsigned long *flags) static inline void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags) { - return 0; } static inline int hwspin_lock_get_id(struct hwspinlock *hwlock) |