diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-26 02:26:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-26 02:26:21 -0500 |
| commit | 19bc291c99f018bd4f2c38bbf69144086dca903f (patch) | |
| tree | 9d3cf9bc0c5a78e363dc0547da8bcd1e7c394265 /drivers/net/wireless/airo.c | |
| parent | 04488734806948624dabc4514f96f14cd75b9a50 (diff) | |
| parent | 4a6967b88af02eebeedfbb91bc09160750225bb5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/rt2x00/rt2800pci.c
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -rw-r--r-- | drivers/net/wireless/airo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index c22a34c7639c..698d5672a070 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | #include <linux/freezer.h> | 51 | #include <linux/freezer.h> |
| 52 | 52 | ||
| 53 | #include <linux/ieee80211.h> | 53 | #include <linux/ieee80211.h> |
| 54 | #include <net/iw_handler.h> | ||
| 54 | 55 | ||
| 55 | #include "airo.h" | 56 | #include "airo.h" |
| 56 | 57 | ||