Merge git://git.infradead.org/mtd-2.6

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

diff --git a/drivers/staging/winbond/wblinux_s.h b/drivers/staging/winbond/wblinux_s.h
index 97e9167ab839b65cb095d330b015c9ed96d65990..fd2bb43bf3cf75a4bf41f8e9f69a20ed534b408f 100644 (file)
--- a/drivers/staging/winbond/wblinux_s.h
+++ b/drivers/staging/winbond/wblinux_s.h
@@ -24,8 +24,8 @@
 
 typedef struct _WBLINUX
 {
-       OS_SPIN_LOCK    AtomicSpinLock;
-       OS_SPIN_LOCK    SpinLock;
+       spinlock_t      AtomicSpinLock;
+       spinlock_t      SpinLock;
        u32     shutdown;
 
        OS_ATOMIC       ThreadCount;