diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-02-21 11:11:05 -0800 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-02-21 11:11:05 -0800 |
| commit | 4bc85c1324aaa4a8bb0171e332ff762b6230bdfe (patch) | |
| tree | 41345e49bdc3279325990e27b4d0d43bb97ed6cc /drivers/net/wireless/iwlwifi/iwl-dev.h | |
| parent | aa833c4b1a928b8d3c4fcc2faaa0d6b81ea02b56 (diff) | |
| download | blackbird-op-linux-4bc85c1324aaa4a8bb0171e332ff762b6230bdfe.tar.gz blackbird-op-linux-4bc85c1324aaa4a8bb0171e332ff762b6230bdfe.zip | |
Revert "iwlwifi: split the drivers for agn and legacy devices 3945/4965"
This reverts commit aa833c4b1a928b8d3c4fcc2faaa0d6b81ea02b56.
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 58165c769cf1..065615ee040a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -43,14 +43,14 @@ #include "iwl-prph.h" #include "iwl-fh.h" #include "iwl-debug.h" +#include "iwl-4965-hw.h" +#include "iwl-3945-hw.h" #include "iwl-agn-hw.h" #include "iwl-led.h" #include "iwl-power.h" #include "iwl-agn-rs.h" #include "iwl-agn-tt.h" -#define U32_PAD(n) ((4-(n))&0x3) - struct iwl_tx_queue; /* CT-KILL constants */ |
