summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-06-29 01:17:55 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-28 22:45:32 -0700
commitb9a05d1d51e27681e8a1162d8f11c1820915e921 (patch)
treedd04a44bcd558d807e3c9ed224bf8e33ecb49778
parenta839688362e32f01608838516036697e30618b39 (diff)
downloadop-kernel-dev-b9a05d1d51e27681e8a1162d8f11c1820915e921.zip
op-kernel-dev-b9a05d1d51e27681e8a1162d8f11c1820915e921.tar.gz
[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>
-rw-r--r--include/net/ieee80211.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 151c4f2..db09580 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)
OpenPOWER on IntegriCloud