diff options
| author |   Charles Clément <caratorn@gmail.com> | 2010-06-02 09:52:00 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-18 10:18:32 -0700 |
| commit | 800acdbdf83efe6a2b4dbe61e3ab676b5c99d153 (patch) | |
| tree | f6cb1635e5bb9fbf53edef8be7c99f8c0542cafd /drivers/staging/vt6655 | |
| parent | Staging: vt6655: remove custom UCHAR typedef (diff) | |
| download | linux-dev-800acdbdf83efe6a2b4dbe61e3ab676b5c99d153.tar.xz linux-dev-800acdbdf83efe6a2b4dbe61e3ab676b5c99d153.zip | |
Staging: vt6655: remove custom USHORT typedef
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655')
| -rw-r--r-- | drivers/staging/vt6655/ttype.h | 1 | ||||
| -rw-r--r-- | drivers/staging/vt6655/wmgr.h | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h index 74ec69f822fe..eaf77d5348e4 100644 --- a/drivers/staging/vt6655/ttype.h +++ b/drivers/staging/vt6655/ttype.h @@ -68,7 +68,6 @@ typedef int BOOL; * but it doesn't matter if they're signed or unsigned. */ -typedef unsigned short USHORT; typedef unsigned int UINT; typedef unsigned long ULONG; typedef unsigned long long ULONGLONG; //64 bit diff --git a/drivers/staging/vt6655/wmgr.h b/drivers/staging/vt6655/wmgr.h index d53aed7ad526..9367f478dbf6 100644 --- a/drivers/staging/vt6655/wmgr.h +++ b/drivers/staging/vt6655/wmgr.h @@ -91,26 +91,26 @@ typedef void (*TimerFunction)(ULONG); typedef unsigned char NDIS_802_11_MAC_ADDRESS[6]; typedef struct _NDIS_802_11_AI_REQFI { - USHORT Capabilities; - USHORT ListenInterval; + unsigned short Capabilities; + unsigned short ListenInterval; NDIS_802_11_MAC_ADDRESS CurrentAPAddress; } NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI; typedef struct _NDIS_802_11_AI_RESFI { - USHORT Capabilities; - USHORT StatusCode; - USHORT AssociationId; + unsigned short Capabilities; + unsigned short StatusCode; + unsigned short AssociationId; } NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI; typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION { ULONG Length; - USHORT AvailableRequestFixedIEs; + unsigned short AvailableRequestFixedIEs; NDIS_802_11_AI_REQFI RequestFixedIEs; ULONG RequestIELength; ULONG OffsetRequestIEs; - USHORT AvailableResponseFixedIEs; + unsigned short AvailableResponseFixedIEs; NDIS_802_11_AI_RESFI ResponseFixedIEs; ULONG ResponseIELength; ULONG OffsetResponseIEs; |