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

[linux-2.6-omap-h63xx.git] / include / net / cfg80211.h

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 65e03ac931097cab24ca08a89d4c75be231e4926..23c0ab74ded63bfbc9f57a36751872be3e195f77 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -563,7 +563,7 @@ struct cfg80211_ops {
 
        int     (*set_channel)(struct wiphy *wiphy,
                               struct ieee80211_channel *chan,
-                              enum nl80211_sec_chan_offset);
+                              enum nl80211_channel_type channel_type);
 };
 
 /* temporary wext handlers */