diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 22:46:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 22:46:46 -0500 |
| commit | d1138cf035ad5a8dc0796b213bd078a2fb92eb7c (patch) | |
| tree | 72a4640fe87720ebfc118f2b3c7f140f5d19d6b7 /include/net/ieee80211_crypt.h | |
| parent | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (diff) | |
| parent | 77783a78ded96a56e3a1a0c03bbe87c56896fe6e (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/net/ieee80211_crypt.h')
| -rw-r--r-- | include/net/ieee80211_crypt.h | 1 |
1 files changed, 1 insertions, 0 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 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/types.h> | 26 | #include <linux/types.h> |
| 27 | #include <linux/list.h> | 27 | #include <linux/list.h> |
| 28 | #include <net/ieee80211.h> | ||
| 28 | #include <asm/atomic.h> | 29 | #include <asm/atomic.h> |
| 29 | 30 | ||
| 30 | enum { | 31 | enum { |