iwlwifi: clean up some hw file includes
authorJohannes Berg <johannes.berg@intel.com>
Tue, 3 Apr 2012 18:57:59 +0000 (20:57 +0200)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Mon, 23 Apr 2012 21:30:16 +0000 (14:30 -0700)
We can't get rid of everything yet due to
the BT definitions that I'm not quite sure
yet how to handle, but we can get rid of
most unneeded includes.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-2000.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-6000.c

index 42de5aa45323a73f1552f213e28d4e3799b3946e..c1aa5f2ed5ee766455c74d8cb8c22fc832899181 100644 (file)
@@ -28,7 +28,8 @@
 #include <linux/stringify.h>
 #include "iwl-config.h"
 #include "iwl-cfg.h"
-#include "iwl-dev.h" /* still needed */
+#include "iwl-csr.h"
+#include "iwl-agn-hw.h"
 
 /* Highest firmware API version supported */
 #define IWL1000_UCODE_API_MAX 6
index d3d8c1021d1645af4b2fadbc9ac0ac295fbfce0f..9484e3be267892a6fd6ec4852aec4f8349be8396 100644 (file)
@@ -28,7 +28,8 @@
 #include <linux/stringify.h>
 #include "iwl-config.h"
 #include "iwl-cfg.h"
-#include "iwl-dev.h" /* still needed */
+#include "iwl-agn-hw.h"
+#include "iwl-commands.h" /* needed for BT for now */
 
 /* Highest firmware API version supported */
 #define IWL2030_UCODE_API_MAX 6
index 94d465ee7d22bc53162039f2b2f375b8a0410cdc..67d4ef26043b4aa76b679bfb09d9ed0d9c52597c 100644 (file)
@@ -28,7 +28,8 @@
 #include <linux/stringify.h>
 #include "iwl-config.h"
 #include "iwl-cfg.h"
-#include "iwl-dev.h" /* still needed */
+#include "iwl-agn-hw.h"
+#include "iwl-csr.h"
 
 /* Highest firmware API version supported */
 #define IWL5000_UCODE_API_MAX 5
index 6db0a4067b8d3884e757c8e1df43dca192244b77..08afedf4b3ec82f10de43a861fb9c08060235ba3 100644 (file)
@@ -28,7 +28,8 @@
 #include <linux/stringify.h>
 #include "iwl-config.h"
 #include "iwl-cfg.h"
-#include "iwl-dev.h" /* still needed */
+#include "iwl-agn-hw.h"
+#include "iwl-commands.h" /* needed for BT for now */
 
 /* Highest firmware API version supported */
 #define IWL6000_UCODE_API_MAX 6