commit e94a4099adb2ec148776975bcd953a01c6bec992
author Stanislaw Gruszka <sgruszka@redhat.com> Wed Aug 31 13:23:20 2011 +0200
committer Stanislaw Gruszka <sgruszka@redhat.com> Tue Nov 15 14:20:09 2011 +0100
tree 45264af5a425af0d113c764512fc4da2e01d1906
parent 98613be06e9de8acd20841d2d85b99c39b3b7814

iwlegacy: merge common header files

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>

drivers/net/wireless/iwlegacy/3945.h

diff --git a/drivers/net/wireless/iwlegacy/3945.h b/drivers/net/wireless/iwlegacy/3945.h
index e89ca5d..726ca2c 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 @@
 #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 @@
 }
 #endif
 
-/* Requires full declaration of il_priv before including */
-#include "iwl-io.h"
-
 #endif