diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-08-31 07:23:20 -0400 |
---|---|---|
committer | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-15 08:20:09 -0500 |
commit | e94a4099adb2ec148776975bcd953a01c6bec992 (patch) | |
tree | 45264af5a425af0d113c764512fc4da2e01d1906 /drivers/net/wireless/iwlegacy/common.c | |
parent | 98613be06e9de8acd20841d2d85b99c39b3b7814 (diff) |
iwlegacy: merge common header files
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index d99ed75a5646..4258bf6d5150 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c | |||
@@ -41,13 +41,9 @@ | |||
41 | #include <net/mac80211.h> | 41 | #include <net/mac80211.h> |
42 | 42 | ||
43 | #include "iwl-eeprom.h" | 43 | #include "iwl-eeprom.h" |
44 | #include "iwl-dev.h" | ||
45 | #include "iwl-debug.h" | 44 | #include "iwl-debug.h" |
46 | #include "common.h" | 45 | #include "common.h" |
47 | #include "iwl-io.h" | ||
48 | #include "iwl-power.h" | 46 | #include "iwl-power.h" |
49 | #include "iwl-sta.h" | ||
50 | #include "iwl-helpers.h" | ||
51 | 47 | ||
52 | const char *il_get_cmd_string(u8 cmd) | 48 | const char *il_get_cmd_string(u8 cmd) |
53 | { | 49 | { |
@@ -4351,7 +4347,7 @@ void il_hdl_pm_debug_stats(struct il_priv *il, | |||
4351 | struct il_rx_buf *rxb) | 4347 | struct il_rx_buf *rxb) |
4352 | { | 4348 | { |
4353 | struct il_rx_pkt *pkt = rxb_addr(rxb); | 4349 | struct il_rx_pkt *pkt = rxb_addr(rxb); |
4354 | u32 len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK; | 4350 | u32 len = le32_to_cpu(pkt->len_n_flags) & IL_RX_FRAME_SIZE_MSK; |
4355 | D_RADIO("Dumping %d bytes of unhandled " | 4351 | D_RADIO("Dumping %d bytes of unhandled " |
4356 | "notification for %s:\n", len, | 4352 | "notification for %s:\n", len, |
4357 | il_get_cmd_string(pkt->hdr.cmd)); | 4353 | il_get_cmd_string(pkt->hdr.cmd)); |