summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/3945.h
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2011-08-31 13:23:20 +0200
committerStanislaw Gruszka <sgruszka@redhat.com>2011-11-15 14:20:09 +0100
commite94a4099adb2ec148776975bcd953a01c6bec992 (patch)
tree45264af5a425af0d113c764512fc4da2e01d1906 /drivers/net/wireless/iwlegacy/3945.h
parent98613be06e9de8acd20841d2d85b99c39b3b7814 (diff)
downloadblackbird-op-linux-e94a4099adb2ec148776975bcd953a01c6bec992.tar.gz
blackbird-op-linux-e94a4099adb2ec148776975bcd953a01c6bec992.zip
iwlegacy: merge common header files
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/3945.h')
-rw-r--r--drivers/net/wireless/iwlegacy/3945.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945.h b/drivers/net/wireless/iwlegacy/3945.h
index e89ca5da7f3c..726ca2c5cd6a 100644
--- a/drivers/net/wireless/iwlegacy/3945.h
+++ b/drivers/net/wireless/iwlegacy/3945.h
@@ -34,10 +34,10 @@
/* Hardware specific file defines the PCI IDs table for that hardware module */
extern const struct pci_device_id il3945_hw_card_ids[];
+#include "common.h"
#include "iwl-prph.h"
#include "iwl-debug.h"
#include "iwl-power.h"
-#include "iwl-dev.h"
#include "iwl-led.h"
#include "iwl-eeprom.h"
@@ -455,10 +455,6 @@ struct il3945_eeprom {
#define RFD_SIZE 4
#define NUM_TFD_CHUNKS 4
-#define RX_QUEUE_SIZE 256
-#define RX_QUEUE_MASK 255
-#define RX_QUEUE_SIZE_LOG 8
-
#define TFD_CTL_COUNT_SET(n) (n << 24)
#define TFD_CTL_COUNT_GET(ctl) ((ctl >> 24) & 7)
#define TFD_CTL_PAD_SET(n) (n << 28)
@@ -659,7 +655,4 @@ static ssize_t il3945_ucode_general_stats_read(struct file *file,
}
#endif
-/* Requires full declaration of il_priv before including */
-#include "iwl-io.h"
-
#endif
OpenPOWER on IntegriCloud