Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / net / mac80211 / tkip.h

diff --git a/net/mac80211/tkip.h b/net/mac80211/tkip.h
index e3ecb659b90af6002966d74acdb05b05e3a0be4d..a1bcbfbefe7c32ca5e0fe6d080818acebb624b9b 100644 (file)
--- a/net/mac80211/tkip.h
+++ b/net/mac80211/tkip.h
@@ -13,8 +13,6 @@
 #include <linux/crypto.h>
 #include "key.h"
 
-u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key);
-
 int ieee80211_tkip_encrypt_data(struct crypto_cipher *tfm,
                                struct ieee80211_key *key,
                                struct sk_buff *skb,