Merge tag 'rxrpc-20140126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells...

[karo-tx-linux.git] / drivers / staging / ced1401 / use14_ioc.h

diff --git a/drivers/staging/ced1401/use14_ioc.h b/drivers/staging/ced1401/use14_ioc.h
index a2f6e6e8e38a1466bcd90134408d80a7d75c62f4..97d7913840dc351e642214a7dc7262e709321262 100644 (file)
--- a/drivers/staging/ced1401/use14_ioc.h
+++ b/drivers/staging/ced1401/use14_ioc.h
@@ -278,9 +278,9 @@ typedef PARAMBLK*   PPARAMBLK;
 
 typedef struct TransferDesc          /* Structure and type for SetTransArea */
 {
-       WORD        wArea;            /* number of transfer area to set up       */
+       unsigned short        wArea;            /* number of transfer area to set up       */
        void FAR *lpvBuff;          /* address of transfer area                */
-       DWORD       dwLength;         /* length of area to set up                */
+       unsigned int       dwLength;         /* length of area to set up                */
        short       eSize;            /* size to move (for swapping on MAC)      */
 } TRANSFERDESC;
 
@@ -289,10 +289,10 @@ typedef TRANSFERDESC FAR *LPTRANSFERDESC;
 /* This is the structure used to set up a transfer area */
 typedef struct VXTransferDesc    /* use1401.c and use1432x.x use only       */
 {
-       WORD        wArea;            /* number of transfer area to set up       */
-       WORD        wAddrSel;         /* 16 bit selector for area                */
-       DWORD       dwAddrOfs;        /* 32 bit offset for area start            */
-       DWORD       dwLength;         /* length of area to set up                */
+       unsigned short        wArea;            /* number of transfer area to set up       */
+       unsigned short        wAddrSel;         /* 16 bit selector for area                */
+       unsigned int       dwAddrOfs;        /* 32 bit offset for area start            */
+       unsigned int       dwLength;         /* length of area to set up                */
 } VXTRANSFERDESC;
 
 #pragma pack()