diff options
| author | Jeff Garzik | 2005-06-29 07:17:55 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-06-29 07:45:32 +0200 |
| commit | b9a05d1d51e27681e8a1162d8f11c1820915e921 (patch) | |
| tree | dd04a44bcd558d807e3c9ed224bf8e33ecb49778 /include | |
| parent | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | kernel-qcow2-linux-b9a05d1d51e27681e8a1162d8f11c1820915e921.tar.gz kernel-qcow2-linux-b9a05d1d51e27681e8a1162d8f11c1820915e921.tar.xz kernel-qcow2-linux-b9a05d1d51e27681e8a1162d8f11c1820915e921.zip | |
[PATCH] ieee80211.h build fix
This crept in with the resync-to-mainline. Nothing uses 802.11-crypt in
mainline, so we can safely comment it out for now.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ieee80211.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 151c4f203559..db09580ad14b 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -426,7 +426,9 @@ struct ieee80211_stats { struct ieee80211_device; +#if 0 /* for later */ #include "ieee80211_crypt.h" +#endif #define SEC_KEY_1 (1<<0) #define SEC_KEY_2 (1<<1) |