Staging: vt665x: Clean up include files, Part 2

[deliverable/linux.git] / drivers / staging / vt6655 / wpactl.h

diff --git a/drivers/staging/vt6655/wpactl.h b/drivers/staging/vt6655/wpactl.h
index b869cfdf42c3ae21d61fd0e54c72e9085bd621ec..b0d92d51a2a671383041c1c9739c8a7e1c11a2c5 100644 (file)
--- a/drivers/staging/vt6655/wpactl.h
+++ b/drivers/staging/vt6655/wpactl.h
@@ -26,19 +26,13 @@
  *
  */
 
-
 #ifndef __WPACTL_H__
 #define __WPACTL_H__
 
-#if !defined(__DEVICE_H__)
 #include "device.h"
-#endif
-
 #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-#if !defined(__IOWPA_H__)
 #include "iowpa.h"
 #endif
-#endif
 
 /*---------------------  Export Definitions -------------------------*/
 
@@ -68,22 +62,10 @@ typedef ULONGLONG   NDIS_802_11_KEY_RSC;
 
 /*---------------------  Export Functions  --------------------------*/
 
-
-#ifdef __cplusplus
-extern "C" {                            /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
 int wpa_set_wpadev(PSDevice pDevice, int val);
 int wpa_ioctl(PSDevice pDevice, struct iw_point *p);
 int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL  fcpfkernel);
 
-#ifdef __cplusplus
-}                                       /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
 #endif // __WPACL_H__