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/rf.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/rf.h')
| -rw-r--r-- | drivers/staging/vt6655/rf.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/staging/vt6655/rf.h b/drivers/staging/vt6655/rf.h index 05fe17b..f316bcc 100644 --- a/drivers/staging/vt6655/rf.h +++ b/drivers/staging/vt6655/rf.h @@ -27,16 +27,12 @@ * */ - #ifndef __RF_H__ #define __RF_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif + /*--------------------- Export Definitions -------------------------*/ // // Baseband RF pair definition in eeprom (Bits 6..0) @@ -79,9 +75,6 @@ /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ BOOL IFRFbWriteEmbeded(DWORD_PTR dwIoBase, DWORD dwData); BOOL RFbSelectChannel(DWORD_PTR dwIoBase, BYTE byRFType, BYTE byChannel); @@ -100,18 +93,13 @@ VOID RFvRSSITodBm( IN PSDevice pDevice, IN BYTE byCurrRSSI, - OUT PLONG pldBm + long *pldBm ); //{{ RobertYu: 20050104 BOOL RFbAL7230SelectChannelPostProcess(DWORD_PTR dwIoBase, BYTE byOldChannel, BYTE byNewChannel); //}} RobertYu -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - #endif // __RF_H__ |