Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[~andy/linux] / drivers / staging / vt6655 / tkip.c

diff --git a/drivers/staging/vt6655/tkip.c b/drivers/staging/vt6655/tkip.c
index 2ded8420c390600436858ee75ca4271b4fd8b2cd..8ca154080e98a9276110bd38b25a95a96a35f99c 100644 (file)
--- a/drivers/staging/vt6655/tkip.c
+++ b/drivers/staging/vt6655/tkip.c
@@ -32,20 +32,8 @@
  *
  */
 
-
-#if !defined(__TMACRO_H__)
 #include "tmacro.h"
-#endif
-#if !defined(__TBIT_H__)
-#include "tbit.h"
-#endif
-#if !defined(__TKIP_H__)
 #include "tkip.h"
-#endif
-#if !defined(__UMEM_H__)
-#include "umem.h"
-#endif
-
 
 /*---------------------  Static Definitions -------------------------*/