Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[~andy/linux] / net / mac80211 / ieee80211_key.h

diff --git a/net/mac80211/ieee80211_key.h b/net/mac80211/ieee80211_key.h
index ae49418f18b47d387629c0021af8afe611cdf428..fc770e98d47b44f3ba64250600db08823714c423 100644 (file)
--- a/net/mac80211/ieee80211_key.h
+++ b/net/mac80211/ieee80211_key.h
@@ -114,7 +114,7 @@ struct ieee80211_key {
 
 struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
                                          struct sta_info *sta,
-                                         ieee80211_key_alg alg,
+                                         enum ieee80211_key_alg alg,
                                          int idx,
                                          size_t key_len,
                                          const u8 *key_data);