Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

[pandora-kernel.git] / arch / blackfin / include / asm / spinlock.h

diff --git a/arch/blackfin/include/asm/spinlock.h b/arch/blackfin/include/asm/spinlock.h
index 47d5a0b..1f286e7 100644 (file)
--- a/arch/blackfin/include/asm/spinlock.h
+++ b/arch/blackfin/include/asm/spinlock.h
@@ -67,6 +67,8 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
        __raw_read_lock_asm(&rw->lock);
 }
 
+#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
+
 static inline int arch_read_trylock(arch_rwlock_t *rw)
 {
        return __raw_read_trylock_asm(&rw->lock);
@@ -82,6 +84,8 @@ static inline void arch_write_lock(arch_rwlock_t *rw)
        __raw_write_lock_asm(&rw->lock);
 }
 
+#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
+
 static inline int arch_write_trylock(arch_rwlock_t *rw)
 {
        return __raw_write_trylock_asm(&rw->lock);