Merge git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs

[karo-tx-linux.git] / net / mac80211 / aes_ccm.c

diff --git a/net/mac80211/aes_ccm.c b/net/mac80211/aes_ccm.c
index bf7ba128b963a49c949b9e240209978dd691d2ac..59f1691f62c89abcfef52f4b2bbc3156cb4c1062 100644 (file)
--- a/net/mac80211/aes_ccm.c
+++ b/net/mac80211/aes_ccm.c
@@ -11,10 +11,9 @@
 #include <linux/types.h>
 #include <linux/crypto.h>
 #include <linux/err.h>
-#include <asm/scatterlist.h>
 
 #include <net/mac80211.h>
-#include "ieee80211_key.h"
+#include "key.h"
 #include "aes_ccm.h"