diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 04:46:46 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 04:46:46 +0100 |
| commit | d1138cf035ad5a8dc0796b213bd078a2fb92eb7c (patch) | |
| tree | 72a4640fe87720ebfc118f2b3c7f140f5d19d6b7 /include | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [PATCH] skge: fix dma mask setup. (diff) | |
| download | linux-d1138cf035ad5a8dc0796b213bd078a2fb92eb7c.tar.xz linux-d1138cf035ad5a8dc0796b213bd078a2fb92eb7c.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ieee80211_crypt.h | 1 | ||||
| -rw-r--r-- | include/net/iw_handler.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h index 03b766afdc39..cd82c3e998e4 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 d67c8393a343..a2c5e0b88422 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; |