Staging: vt665x: Clean up include files, Part 2

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>

diff --cc drivers/staging/vt6655/80211hdr.h
Simple merge

diff --cc drivers/staging/vt6655/80211mgr.c
Simple merge

diff --cc drivers/staging/vt6655/80211mgr.h
Simple merge

diff --cc drivers/staging/vt6655/IEEE11h.c
Simple merge

diff --cc drivers/staging/vt6655/IEEE11h.h
Simple merge

diff --cc drivers/staging/vt6655/TODO
Simple merge

diff --cc drivers/staging/vt6655/aes_ccmp.c
Simple merge

diff --cc drivers/staging/vt6655/aes_ccmp.h
Simple merge

diff --cc drivers/staging/vt6655/baseband.c
Simple merge

diff --cc drivers/staging/vt6655/baseband.h
Simple merge

diff --cc drivers/staging/vt6655/bssdb.c
Simple merge

diff --cc drivers/staging/vt6655/bssdb.h
Simple merge

diff --cc drivers/staging/vt6655/card.c
Simple merge

diff --cc drivers/staging/vt6655/card.h
Simple merge

diff --cc drivers/staging/vt6655/country.h
Simple merge

diff --cc drivers/staging/vt6655/datarate.c
Simple merge

diff --cc drivers/staging/vt6655/desc.h
Simple merge

diff --cc drivers/staging/vt6655/device.h
Simple merge

diff --cc drivers/staging/vt6655/device_main.c
Simple merge

diff --cc drivers/staging/vt6655/dpc.c
Simple merge

diff --cc drivers/staging/vt6655/dpc.h
Simple merge

diff --cc drivers/staging/vt6655/hostap.c
Simple merge

diff --cc drivers/staging/vt6655/hostap.h
Simple merge

diff --cc drivers/staging/vt6655/iocmd.h
Simple merge

diff --cc drivers/staging/vt6655/ioctl.c
Simple merge

diff --cc drivers/staging/vt6655/ioctl.h
Simple merge

diff --cc drivers/staging/vt6655/iowpa.h
Simple merge

diff --cc drivers/staging/vt6655/iwctl.c
Simple merge

diff --cc drivers/staging/vt6655/iwctl.h
Simple merge

diff --cc drivers/staging/vt6655/kcompat.h
Simple merge

diff --cc drivers/staging/vt6655/key.c
Simple merge

diff --cc drivers/staging/vt6655/key.h
Simple merge

diff --cc drivers/staging/vt6655/mac.c
Simple merge

diff --cc drivers/staging/vt6655/mac.h
Simple merge

diff --cc drivers/staging/vt6655/mib.c
Simple merge

diff --cc drivers/staging/vt6655/mib.h
Simple merge

diff --cc drivers/staging/vt6655/michael.c
Simple merge

diff --cc drivers/staging/vt6655/michael.h
Simple merge

diff --cc drivers/staging/vt6655/power.c
Simple merge

diff --cc drivers/staging/vt6655/rc4.c
Simple merge

diff --cc drivers/staging/vt6655/rc4.h
Simple merge

diff --cc drivers/staging/vt6655/rf.c
Simple merge

diff --cc drivers/staging/vt6655/rf.h
Simple merge

diff --cc drivers/staging/vt6655/rxtx.c
Simple merge

diff --cc drivers/staging/vt6655/rxtx.h
Simple merge

diff --cc drivers/staging/vt6655/srom.c
Simple merge

diff --cc drivers/staging/vt6655/srom.h
Simple merge

diff --cc drivers/staging/vt6655/tbit.h
Simple merge

diff --cc drivers/staging/vt6655/tcrc.c
Simple merge

diff --cc drivers/staging/vt6655/tcrc.h
Simple merge

diff --cc drivers/staging/vt6655/tether.c
Simple merge

diff --cc drivers/staging/vt6655/tether.h
Simple merge

diff --cc drivers/staging/vt6655/tkip.c
Simple merge

diff --cc drivers/staging/vt6655/tkip.h
Simple merge

diff --cc drivers/staging/vt6655/tmacro.h
Simple merge

diff --cc drivers/staging/vt6655/tpci.h
Simple merge

diff --cc drivers/staging/vt6655/umem.h
Simple merge

diff --cc drivers/staging/vt6655/upc.h
Simple merge

diff --cc drivers/staging/vt6655/vntwifi.c
Simple merge

diff --cc drivers/staging/vt6655/vntwifi.h
Simple merge

diff --cc drivers/staging/vt6655/wcmd.c
Simple merge

diff --cc drivers/staging/vt6655/wcmd.h
Simple merge

diff --cc drivers/staging/vt6655/wctl.c
Simple merge

diff --cc drivers/staging/vt6655/wctl.h
Simple merge

diff --cc drivers/staging/vt6655/wmgr.c
Simple merge

diff --cc drivers/staging/vt6655/wmgr.h
Simple merge

diff --cc drivers/staging/vt6655/wpa.c
Simple merge

diff --cc drivers/staging/vt6655/wpa.h
Simple merge

diff --cc drivers/staging/vt6655/wpa2.c
Simple merge

diff --cc drivers/staging/vt6655/wpa2.h
Simple merge

diff --cc drivers/staging/vt6655/wpactl.c
Simple merge

diff --cc drivers/staging/vt6655/wpactl.h
Simple merge

diff --cc drivers/staging/vt6655/wroute.c
Simple merge

diff --cc drivers/staging/vt6655/wroute.h
Simple merge