diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 23:45:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 23:45:25 -0400 |
| commit | 30b4d6565e4d57c6d03600c7822411c7cac19638 (patch) | |
| tree | 57244f2a9694de61b373631841fc493bbdf43022 /net | |
| parent | aa8f6dfd355021b4dd8b74b0588fd6fd8f21b79f (diff) | |
| parent | ad3fee560bc508008b3b2cf6358105c4c7081921 (diff) | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'net')
| -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 |
3 files changed, 0 insertions, 3 deletions
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c index 90bc50b97ea7..e0802b8755a0 100644 --- a/net/ieee80211/ieee80211_module.c +++ b/net/ieee80211/ieee80211_module.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 41 | #include <linux/module.h> | 41 | #include <linux/module.h> |
| 42 | #include <linux/netdevice.h> | 42 | #include <linux/netdevice.h> |
| 43 | #include <linux/pci.h> | ||
| 44 | #include <linux/proc_fs.h> | 43 | #include <linux/proc_fs.h> |
| 45 | #include <linux/skbuff.h> | 44 | #include <linux/skbuff.h> |
| 46 | #include <linux/slab.h> | 45 | #include <linux/slab.h> |
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 2ae6ab8914b0..0dd102993ef4 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/netdevice.h> | 25 | #include <linux/netdevice.h> |
| 26 | #include <linux/pci.h> | ||
| 27 | #include <linux/proc_fs.h> | 26 | #include <linux/proc_fs.h> |
| 28 | #include <linux/skbuff.h> | 27 | #include <linux/skbuff.h> |
| 29 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index a3054c5c0c05..d1049edcd14d 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/netdevice.h> | 35 | #include <linux/netdevice.h> |
| 36 | #include <linux/pci.h> | ||
| 37 | #include <linux/proc_fs.h> | 36 | #include <linux/proc_fs.h> |
| 38 | #include <linux/skbuff.h> | 37 | #include <linux/skbuff.h> |
| 39 | #include <linux/slab.h> | 38 | #include <linux/slab.h> |