diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:04:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:04:01 -0500 |
| commit | 8cde0776ec1e86c270f65bf482f96288e6bf0023 (patch) | |
| tree | 6350a8d67bea7bcdcbd1705a54f1b8e409a28775 /net | |
| 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')
| -rw-r--r-- | net/ieee80211/ieee80211_crypt.c | 1 | ||||
| -rw-r--r-- | net/ieee80211/ieee80211_crypt_ccmp.c | 1 | ||||
| -rw-r--r-- | net/ieee80211/ieee80211_crypt_tkip.c | 1 | ||||
| -rw-r--r-- | net/ieee80211/ieee80211_crypt_wep.c | 1 | ||||
| -rw-r--r-- | net/ieee80211/ieee80211_geo.c | 1 | ||||
| -rw-r--r-- | net/ieee80211/ieee80211_module.c | 1 | ||||
| -rw-r--r-- | net/ieee80211/ieee80211_rx.c | 1 | ||||
| -rw-r--r-- | net/ieee80211/ieee80211_tx.c | 1 |
8 files changed, 0 insertions, 8 deletions
diff --git a/net/ieee80211/ieee80211_crypt.c b/net/ieee80211/ieee80211_crypt.c index f3b6aa3be638..20cc580a07e0 100644 --- a/net/ieee80211/ieee80211_crypt.c +++ b/net/ieee80211/ieee80211_crypt.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | 14 | #include <linux/config.h> |
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c index 05a853c13012..470221728503 100644 --- a/net/ieee80211/ieee80211_crypt_ccmp.c +++ b/net/ieee80211/ieee80211_crypt_ccmp.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
| 13 | #include <linux/version.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c index 2e34f29b7956..e0988320efbf 100644 --- a/net/ieee80211/ieee80211_crypt_tkip.c +++ b/net/ieee80211/ieee80211_crypt_tkip.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
| 13 | #include <linux/version.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c index 7c08ed2f2628..073aebdf0f67 100644 --- a/net/ieee80211/ieee80211_crypt_wep.c +++ b/net/ieee80211/ieee80211_crypt_wep.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
| 13 | #include <linux/version.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
diff --git a/net/ieee80211/ieee80211_geo.c b/net/ieee80211/ieee80211_geo.c index c4b54ef8f6d5..610cc5cbc252 100644 --- a/net/ieee80211/ieee80211_geo.c +++ b/net/ieee80211/ieee80211_geo.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <linux/slab.h> | 38 | #include <linux/slab.h> |
| 39 | #include <linux/tcp.h> | 39 | #include <linux/tcp.h> |
| 40 | #include <linux/types.h> | 40 | #include <linux/types.h> |
| 41 | #include <linux/version.h> | ||
| 42 | #include <linux/wireless.h> | 41 | #include <linux/wireless.h> |
| 43 | #include <linux/etherdevice.h> | 42 | #include <linux/etherdevice.h> |
| 44 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
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> |
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index ce694cf5c160..6ad88218f573 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
| 29 | #include <linux/tcp.h> | 29 | #include <linux/tcp.h> |
| 30 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 31 | #include <linux/version.h> | ||
| 32 | #include <linux/wireless.h> | 31 | #include <linux/wireless.h> |
| 33 | #include <linux/etherdevice.h> | 32 | #include <linux/etherdevice.h> |
| 34 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index 95ccbadbf55b..445f206e65e0 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <linux/slab.h> | 38 | #include <linux/slab.h> |
| 39 | #include <linux/tcp.h> | 39 | #include <linux/tcp.h> |
| 40 | #include <linux/types.h> | 40 | #include <linux/types.h> |
| 41 | #include <linux/version.h> | ||
| 42 | #include <linux/wireless.h> | 41 | #include <linux/wireless.h> |
| 43 | #include <linux/etherdevice.h> | 42 | #include <linux/etherdevice.h> |
| 44 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |