diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 21:15:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 21:15:15 -0400 |
| commit | 33e2bf6aa16061bae1253514e7c32af27d2b4b31 (patch) | |
| tree | 652d13b4feea9a8f562186e7badae72d2e22fe1f /drivers/net/wireless/iwlwifi/iwl-6000.c | |
| parent | e880eb6c5c9d98e389ffc0d8947f75d70785361a (diff) | |
| parent | 819bfecc4fc6b6e5a793f719a45b7146ce423b79 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index c4844adff92a..4b7bc008220f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include "iwl-core.h" | 42 | #include "iwl-core.h" |
| 43 | #include "iwl-io.h" | 43 | #include "iwl-io.h" |
| 44 | #include "iwl-sta.h" | 44 | #include "iwl-sta.h" |
| 45 | #include "iwl-agn.h" | ||
| 45 | #include "iwl-helpers.h" | 46 | #include "iwl-helpers.h" |
| 46 | #include "iwl-5000-hw.h" | 47 | #include "iwl-5000-hw.h" |
| 47 | #include "iwl-6000-hw.h" | 48 | #include "iwl-6000-hw.h" |