diff options
| author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
|---|---|---|
| committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/staging/vt6655/vntwifi.h | |
| parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
| parent | perf tools: Move dereference after NULL test (diff) | |
| download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip | |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'drivers/staging/vt6655/vntwifi.h')
| -rw-r--r-- | drivers/staging/vt6655/vntwifi.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/staging/vt6655/vntwifi.h b/drivers/staging/vt6655/vntwifi.h index 3e620a726212..2854dfcb19aa 100644 --- a/drivers/staging/vt6655/vntwifi.h +++ b/drivers/staging/vt6655/vntwifi.h @@ -30,15 +30,10 @@ #ifndef __VNTWIFI_H__ #define __VNTWIFI_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif +#include "wpa2.h" /*--------------------- Export Definitions -------------------------*/ #define RATE_1M 0 @@ -67,8 +62,6 @@ #define MAX_BSS_NUM 42 -#define MAX_PMKID_CACHE 16 - // Pre-configured Authenticaiton Mode (from XP) typedef enum tagWMAC_AUTHENTICATION_MODE { @@ -147,11 +140,6 @@ typedef enum tagWMAC_POWER_MODE { /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - - VOID VNTWIFIvSetIBSSParameter ( IN PVOID pMgmtHandle, @@ -322,9 +310,4 @@ VNTWIFIbRadarPresent( ); */ -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - #endif //__VNTWIFI_H__ |