Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[linux-2.6-omap-h63xx.git] / drivers / staging / winbond / linux / common.h

diff --git a/drivers/staging/winbond/linux/common.h b/drivers/staging/winbond/linux/common.h
index c8f14b7b5b22aade61baf40a91d29133f6c22b4f..712a86cfa68b5650c1c0396f7914e4a31ed8fa0a 100644 (file)
--- a/drivers/staging/winbond/linux/common.h
+++ b/drivers/staging/winbond/linux/common.h
@@ -105,13 +105,6 @@ typedef struct urb * PURB;
 #define OS_MEMORY_CLEAR( _A, _S )      memset( (u8 *)_A,0,_S)
 #define OS_MEMORY_COMPARE( _A, _B, _S )        (memcmp(_A,_B,_S)? 0 : 1) // Definition is reverse with Ndis 1: the same 0: different
 
-
-#define OS_SPIN_LOCK                           spinlock_t
-#define OS_SPIN_LOCK_ALLOCATE( _S )            spin_lock_init( _S );
-#define OS_SPIN_LOCK_FREE( _S )
-#define OS_SPIN_LOCK_ACQUIRED( _S )            spin_lock_irq( _S )
-#define OS_SPIN_LOCK_RELEASED( _S )            spin_unlock_irq( _S );
-
 #define OS_TIMER       struct timer_list
 #define OS_TIMER_INITIAL( _T, _F, _P )                 \
 {                                                      \