diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/winbond/wbhal_s.h | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/winbond/wbhal_s.h')
| -rw-r--r-- | drivers/staging/winbond/wbhal_s.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h index 16d0e6f..372a05e 100644 --- a/drivers/staging/winbond/wbhal_s.h +++ b/drivers/staging/winbond/wbhal_s.h @@ -314,7 +314,7 @@ typedef struct _T02_DESCRIPTOR }; } T02_DESCRIPTOR, *PT02_DESCRIPTOR; -typedef struct _DESCRIPTOR { // Skip length = 8 DWORD +struct wb35_descriptor { // Skip length = 8 DWORD // ID for descriptor ---, The field doesn't be cleard in the operation of Descriptor definition u8 Descriptor_ID; //----------------------The above region doesn't be cleared by DESCRIPTOR_RESET------ @@ -368,7 +368,7 @@ typedef struct _DESCRIPTOR { // Skip length = 8 DWORD u16 buffer_size[ MAX_DESCRIPTOR_BUFFER_INDEX ]; void* buffer_address[ MAX_DESCRIPTOR_BUFFER_INDEX ];//931130.4.q -} DESCRIPTOR, *PDESCRIPTOR; +}; #define DEFAULT_NULL_PACKET_COUNT 180000 //20060828.1 Add. 180 seconds |