commit 9d26d60f99855056a20ac7c0b68eb5ed04619831
author Jim Lieb <lieb@canonical.com> Wed Aug 12 14:54:08 2009 -0700
committer Greg Kroah-Hartman <gregkh@suse.de> Tue Sep 15 12:02:07 2009 -0700
tree 78c5c3c05f639051eb0be9c38ed4fdf6a9f78fa4
parent a884847a1a30be9a55d975f1e3fe8cf5f922bb79

Staging: vt665x: Clean up include files, Part 1

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>

drivers/staging/vt6656/wpa2.c

diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.c
index 82c972d..1e6244f 100644
--- a/drivers/staging/vt6656/wpa2.c
+++ b/drivers/staging/vt6656/wpa2.c
@@ -30,19 +30,11 @@
  * Date: Oct. 4, 2004
  *
  */
-#if !defined(__WPA2_H__)
-#include "wpa2.h"
-#endif
-#if !defined(__UMEM_H__)
-#include "umem.h"
-#endif
-#if !defined(__DEVICE_H__)
-#include "device.h"
-#endif
-#if !defined(__WMGR_H__)
-#include "wmgr.h"
-#endif
 
+#include "wpa2.h"
+#include "umem.h"
+#include "device.h"
+#include "wmgr.h"
 
 /*---------------------  Static Definitions -------------------------*/
 static int          msglevel                =MSG_LEVEL_INFO;