diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 08:04:01 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 08:04:01 -0800 |
commit | 8cde0776ec1e86c270f65bf482f96288e6bf0023 (patch) | |
tree | 6350a8d67bea7bcdcbd1705a54f1b8e409a28775 /net/ieee80211/ieee80211_tx.c | |
parent | 2ed5e6d09e266bd2288d49aaaf240ed8c468c13c (diff) | |
parent | b78612b796b0d6cdfba553d456eff008278830e3 (diff) |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'net/ieee80211/ieee80211_tx.c')
-rw-r--r-- | net/ieee80211/ieee80211_tx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index 95ccbadbf55..445f206e65e 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c @@ -38,7 +38,6 @@ #include <linux/slab.h> #include <linux/tcp.h> #include <linux/types.h> -#include <linux/version.h> #include <linux/wireless.h> #include <linux/etherdevice.h> #include <asm/uaccess.h> |