Revert "staging: rtl8192u: rename CONFIG_IEEE80211_CRYPT_TKIP"

This reverts commit f8cc81f845456c126fd0ab4d8379a8c47f5ca743.

It breaks the build in linux-next.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
Simple merge

diff --cc drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
Simple merge