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

[~andy/linux] / drivers / staging / vt6655 / wroute.h

diff --git a/drivers/staging/vt6655/wroute.h b/drivers/staging/vt6655/wroute.h
index ea5f5896e9ba6eca0c1e951c39050092ecf6dad9..295cdc5b8e9d4471cfa5a872fd3ba2383bf2be2e 100644 (file)
--- a/drivers/staging/vt6655/wroute.h
+++ b/drivers/staging/vt6655/wroute.h
@@ -26,16 +26,10 @@
  *
  */
 
-
 #ifndef __WROUTE_H__
 #define __WROUTE_H__
 
-
-#if !defined(__DEVICE_H__)
 #include "device.h"
-#endif
-
-
 
 /*---------------------  Export Definitions -------------------------*/
 
@@ -45,20 +39,8 @@
 
 /*---------------------  Export Functions  --------------------------*/
 
-
-#ifdef __cplusplus
-extern "C" {                            /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
 BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeIndex);
 
-#ifdef __cplusplus
-}                                       /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
 #endif // __WROUTE_H__