diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-07 15:03:53 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-07 15:03:53 +1000 |
| commit | 8e4e9eca1099ba69893511d21bb09fa25163218a (patch) | |
| tree | ec6d6ac99bb1e854c1ebea5356f0f9be90142a65 /drivers/staging/vt6656/tkip.h | |
| parent | 8a95ccb08f38db0371634dbf1e34a5094ff00c6e (diff) | |
| parent | c1cfeb2b7e86543897b250717bcd4ae7c8f8a6b9 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/hv/hv.c
drivers/staging/netwave/netwave_cs.c
drivers/staging/wavelan/wavelan.c
drivers/staging/wavelan/wavelan_cs.c
Diffstat (limited to 'drivers/staging/vt6656/tkip.h')
| -rw-r--r-- | drivers/staging/vt6656/tkip.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/vt6656/tkip.h b/drivers/staging/vt6656/tkip.h index 847ecdf97ee8..47c3a853b92a 100644 --- a/drivers/staging/vt6656/tkip.h +++ b/drivers/staging/vt6656/tkip.h @@ -46,7 +46,7 @@ /*--------------------- Export Functions --------------------------*/ -VOID TKIPvMixKey( +void TKIPvMixKey( PBYTE pbyTKey, PBYTE pbyTA, WORD wTSC15_0, @@ -54,7 +54,4 @@ VOID TKIPvMixKey( PBYTE pbyRC4Key ); -#endif // __TKIP_H__ - - - +#endif /* __TKIP_H__ */ |