staging: vt6655: deadcode remove aes_ccmp/rc4/tkip
authorMalcolm Priestley <tvboxspy@gmail.com>
Wed, 29 Oct 2014 17:55:38 +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/Makefile
drivers/staging/vt6655/aes_ccmp.c [deleted file]
drivers/staging/vt6655/aes_ccmp.h [deleted file]
drivers/staging/vt6655/device.h
drivers/staging/vt6655/rc4.c [deleted file]
drivers/staging/vt6655/rc4.h [deleted file]
drivers/staging/vt6655/rxtx.c
drivers/staging/vt6655/tkip.c [deleted file]
drivers/staging/vt6655/tkip.h [deleted file]

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