diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-20 18:04:00 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-20 18:04:00 +1000 |
commit | 361dc7821cd538299bbd08cf6bbc4612b4f94d66 (patch) | |
tree | 84eb560ef472c019ae37281fb23357f34d3ab3ae /drivers/staging/vt6655/tcrc.h | |
parent | 6ed1acfe3c12fdaaa14903354e2a07e53d7b086f (diff) | |
parent | cbb48c98bc949c140c933433b1de533d0c334e89 (diff) |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/vt6655/tcrc.h')
-rw-r--r-- | drivers/staging/vt6655/tcrc.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/staging/vt6655/tcrc.h b/drivers/staging/vt6655/tcrc.h index ebea22ed2da6..5faa48b0a748 100644 --- a/drivers/staging/vt6655/tcrc.h +++ b/drivers/staging/vt6655/tcrc.h @@ -26,16 +26,10 @@ * */ - #ifndef __TCRC_H__ #define __TCRC_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - - - /*--------------------- Export Definitions -------------------------*/ @@ -48,23 +42,11 @@ /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - DWORD CRCdwCrc32(PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed); DWORD CRCdwGetCrc32(PBYTE pbyData, UINT cbByte); DWORD CRCdwGetCrc32Ex(PBYTE pbyData, UINT cbByte, DWORD dwPreCRC); - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __TCRC_H__ |