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/vt6655/rc4.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/vt6655/rc4.h')
| -rw-r--r-- | drivers/staging/vt6655/rc4.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/vt6655/rc4.h b/drivers/staging/vt6655/rc4.h index 4e3ccc5..bf607c9 100644 --- a/drivers/staging/vt6655/rc4.h +++ b/drivers/staging/vt6655/rc4.h @@ -30,11 +30,7 @@ #ifndef __RC4_H__ #define __RC4_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - - /*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Types ------------------------------*/ @@ -42,7 +38,7 @@ typedef struct { UINT ux; UINT uy; BYTE abystate[256]; -} RC4Ext, DEF* PRC4Ext; +} RC4Ext, *PRC4Ext; VOID rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len); UINT rc4_byte(PRC4Ext pRC4); |