Commit 9d26d60f authored by Jim Lieb's avatar Jim Lieb Committed by Greg Kroah-Hartman
Browse files

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: default avatarJim Lieb <lieb@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a884847a

drivers/staging/vt6656/80211hdr.h

+0 −5
Original line number Diff line number Diff line
@@ -28,15 +28,10 @@ 
 *

 */







#ifndef __80211HDR_H__

#define __80211HDR_H__





#if !defined(__TTYPE_H__)

#include "ttype.h"

#endif



/*---------------------  Export Definitions -------------------------*/

// bit type

drivers/staging/vt6656/80211mgr.c

+0 −16
Original line number Diff line number Diff line
@@ -52,28 +52,12 @@ 
 *

 */







#if !defined(__TMACRO_H__)

#include "tmacro.h"

#endif

#if !defined(__TETHER_H__)

#include "tether.h"

#endif

#if !defined(__80211MGR_H__)

#include "80211mgr.h"

#endif

#if !defined(__80211HDR_H__)

#include "80211hdr.h"

#endif

#if !defined(__DEVICE_H__)

#include "device.h"

#endif

#if !defined(__WPA_H__)

#include "wpa.h"

#endif







/*---------------------  Static Definitions -------------------------*/

drivers/staging/vt6656/80211mgr.h

+0 −6
Original line number Diff line number Diff line
@@ -28,17 +28,11 @@ 
 *

 */





#ifndef __80211MGR_H__

#define __80211MGR_H__



#if !defined(__TTYPE_H__)

#include "ttype.h"

#endif

#if !defined(__80211HDR_H__)

#include "80211hdr.h"

#endif





/*---------------------  Export Definitions -------------------------*/

drivers/staging/vt6656/TODO

+1 −1
Original line number Diff line number Diff line 
TODO:

- remove __cplusplus ifdefs

- remove __cplusplus ifdefs -- done

- remove kernel version compatibility wrappers

- remove support for older wireless extensions

- prepare for merge with vt6655 driver:

drivers/staging/vt6656/aes_ccmp.c

+0 −7
Original line number Diff line number Diff line
@@ -33,16 +33,9 @@ 
 *

 */



#if !defined(__UMEM_H__)

#include "umem.h"

#endif

#if !defined(__DEVICE_H__)

#include "device.h"

#endif

#if !defined(__80211HDR_H__)

#include "80211hdr.h"

#endif





/*---------------------  Static Definitions -------------------------*/