aboutsummaryrefslogtreecommitdiffstats
path: root/net/ieee80211/ieee80211_module.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 11:04:01 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 11:04:01 -0500
commit8cde0776ec1e86c270f65bf482f96288e6bf0023 (patch)
tree6350a8d67bea7bcdcbd1705a54f1b8e409a28775 /net/ieee80211/ieee80211_module.c
parent2ed5e6d09e266bd2288d49aaaf240ed8c468c13c (diff)
parentb78612b796b0d6cdfba553d456eff008278830e3 (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'net/ieee80211/ieee80211_module.c')
-rw-r--r--net/ieee80211/ieee80211_module.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
index f66d792cd204..321287bc887f 100644
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -45,7 +45,6 @@
45#include <linux/slab.h> 45#include <linux/slab.h>
46#include <linux/tcp.h> 46#include <linux/tcp.h>
47#include <linux/types.h> 47#include <linux/types.h>
48#include <linux/version.h>
49#include <linux/wireless.h> 48#include <linux/wireless.h>
50#include <linux/etherdevice.h> 49#include <linux/etherdevice.h>
51#include <asm/uaccess.h> 50#include <asm/uaccess.h>