From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 28 May 2014 21:15:37 +0000 (-0700)
Subject: Revert "staging: rtl8192u: rename CONFIG_IEEE80211_CRYPT_TKIP"
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~36^2~91
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81aa143bae1595e478e7c20644fcd236936bfeaa;p=pandora-kernel.git

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

Reading git-diff-tree failed