Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/wireless-2.6

2 files changed, 2 insertions, 1 deletions

diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h
index 03b766afdc3..cd82c3e998e 100644
--- a/include/net/ieee80211_crypt.h
+++ b/include/net/ieee80211_crypt.h
@@ -25,6 +25,7 @@
 
 #include <linux/types.h>
 #include <linux/list.h>
+#include <net/ieee80211.h>
 #include <asm/atomic.h>
 
 enum {
diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h
index d67c8393a34..a2c5e0b8842 100644
--- a/include/net/iw_handler.h
+++ b/include/net/iw_handler.h
@@ -327,7 +327,7 @@ struct iw_handler_def
         __u16                   num_private_args;
 
         /* Array of handlers for standard ioctls
-         * We will call dev->wireless_handlers->standard[ioctl - SIOCSIWNAME]
+         * We will call dev->wireless_handlers->standard[ioctl - SIOCSIWCOMMIT]
          */
         const iw_handler *      standard;