summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/mac.h
diff options
context:
space:
mode:
authorJim Lieb2009-08-12 23:54:09 +0200
committerGreg Kroah-Hartman2009-09-15 21:02:08 +0200
commita7ad322a46663755718a214a9a34e5cfe64d07f7 (patch)
tree619bceb63a7cd8b95c504d1292bcc48d8ca3de4b /drivers/staging/vt6655/mac.h
parentStaging: vt665x: Clean up include files, Part 1 (diff)
downloadkernel-qcow2-linux-a7ad322a46663755718a214a9a34e5cfe64d07f7.tar.gz
kernel-qcow2-linux-a7ad322a46663755718a214a9a34e5cfe64d07f7.tar.xz
kernel-qcow2-linux-a7ad322a46663755718a214a9a34e5cfe64d07f7.zip
Staging: vt665x: Clean up include files, Part 2
Remove cplusplus lines from include files Remove needless ifdefs on includes to conform with C conventions. Remove misc commented code/includes Update TODO Signed-off-by: Jim Lieb <lieb@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/mac.h')
-rw-r--r--drivers/staging/vt6655/mac.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index c92867b16899..3ba87fb64d3c 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -34,15 +34,9 @@
#ifndef __MAC_H__
#define __MAC_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__UPC_H__)
#include "upc.h"
-#endif
/*--------------------- Export Definitions -------------------------*/
//
@@ -1079,9 +1073,6 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
extern WORD TxRate_iwconfig;//2008-5-8 <add> by chester
VOID MACvReadAllRegs(DWORD_PTR dwIoBase, PBYTE pbyMacRegs);
@@ -1156,9 +1147,5 @@ void MACvDisableDefaultKey(DWORD_PTR dwIoBase);
void MACvSetDefaultTKIPKeyEntry(DWORD_PTR dwIoBase, UINT uKeyLen, UINT uKeyIdx, PDWORD pdwKey, BYTE byLocalID);
void MACvSetDefaultKeyCtl(DWORD_PTR dwIoBase, WORD wKeyCtl, UINT uEntryIdx, BYTE byLocalID);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
#endif // __MAC_H__