Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

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

diff --git a/drivers/staging/winbond/linux/wb35reg_s.h b/drivers/staging/winbond/linux/wb35reg_s.h
index a7595b1e73368ddcb743237065f323a5f92eecbb..8b35b93f7f0256f5119fbb37a35ff0aeab25fb40 100644 (file)
--- a/drivers/staging/winbond/linux/wb35reg_s.h
+++ b/drivers/staging/winbond/linux/wb35reg_s.h
@@ -75,7 +75,7 @@ typedef struct _REG_QUEUE
        union
        {
                u32     VALUE;
-               PULONG  pBuffer;
+               u32 *   pBuffer;
        };
        u8      RESERVED[4];// space reserved for communication
 
@@ -143,7 +143,7 @@ typedef struct _WB35REG
        //-------------------
        // VM
        //-------------------
-       OS_SPIN_LOCK    EP0VM_spin_lock; // 4B
+       spinlock_t      EP0VM_spin_lock; // 4B
        u32             EP0VM_status;//$$
        PREG_QUEUE          pRegFirst;
        PREG_QUEUE          pRegLast;