diff --git a/[refs] b/[refs] index 9ad6af4cb567..53ac73767871 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42caa16a70b875bb171874af329c7575fa10c091 +refs/heads/master: 47a14f13c81c407f816917528f84b85532af2819 diff --git a/trunk/drivers/staging/vt6655/rxtx.h b/trunk/drivers/staging/vt6655/rxtx.h index 17bd1b1f40e6..5da815efe70b 100644 --- a/trunk/drivers/staging/vt6655/rxtx.h +++ b/trunk/drivers/staging/vt6655/rxtx.h @@ -35,17 +35,10 @@ /*--------------------- Export Definitions -------------------------*/ -/*--------------------- Export Classes ----------------------------*/ - /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ - -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - /* VOID vGenerateMACHeader( IN PSDevice pDevice, @@ -111,14 +104,4 @@ VOID vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT c CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __RXTX_H__ - - -