staging: vt6655: dead code remove wpa/wpa2
authorMalcolm Priestley <tvboxspy@gmail.com>
Wed, 29 Oct 2014 17:55:37 +0000 (17:55 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2014 20:34:43 +0000 (13:34 -0700)
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/80211mgr.c
drivers/staging/vt6655/Makefile
drivers/staging/vt6655/vntwifi.c
drivers/staging/vt6655/vntwifi.h
drivers/staging/vt6655/wmgr.h
drivers/staging/vt6655/wpa.c [deleted file]
drivers/staging/vt6655/wpa.h [deleted file]
drivers/staging/vt6655/wpa2.c [deleted file]
drivers/staging/vt6655/wpa2.h [deleted file]

Simple merge
Simple merge
Simple merge
Simple merge
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